Scripts had not properly updated the 3.0 sysdef. These should be correct.
--- a/symbian3/app/location/package_definition_3.0.xml Wed Feb 03 19:36:09 2010 +0000
+++ b/symbian3/app/location/package_definition_3.0.xml Wed Feb 03 20:06:22 2010 +0000
@@ -55,42 +55,59 @@
</component>
</collection>
<collection id="locationlandmarksrefappfors60" name="Location Landmarks Reference App for S60" level="apps">
+ <!-- this is a component, needs to be moved down a directory -->
<component id="lmrefapp" filter="s60" name="Landmarks Reference Application">
<unit bldFile="locationlandmarksrefappfors60/group"/>
</component>
</collection>
<collection id="locationlandmarksuirefapp" name="Location Landmarks UI Reference App" level="apps">
+ <!-- this is a component, needs to be moved down a directory -->
<component id="lmuirefapp" filter="s60" name="Landmarks UI Reference Application">
<unit bldFile="locationlandmarksuirefapp/group"/>
</component>
</collection>
<collection id="locationsatviewrefapp" name="Location Satellite View Reference App" level="apps">
+ <!-- this is a component, needs to be moved down a directory -->
<component id="satellitereference" filter="s60" name="Satellite Info UI Reference Application">
<unit bldFile="locationsatviewrefapp/group"/>
</component>
</collection>
<collection id="simpsyconfigurator" name="Simulation PSY Configurator" level="ui">
+ <!-- this is a component, needs to be moved down a directory -->
<component id="simpsyui" filter="s60" name="Simulation PSY UI">
<unit bldFile="simpsyconfigurator/group"/>
</component>
</collection>
<collection id="mapnavproviderrefapp" name="Map and Navigation Provider Reference App" level="apps">
+ <!-- this is a component, needs to be moved down a directory -->
<component id="mapnavproviderrefapp_build" filter="s60" name="Map and Navigation Provider Reference Application">
<unit bldFile="mapnavproviderrefapp/group"/>
</component>
</collection>
+ <collection id="locationcentre" name="Location Centre" level="loc">
+ <component id="lcutils" name="Location Centre Utilities" filter="s60" introduced="^3">
+ <unit bldFile="locationcentre/lcutils/group"/>
+ </component>
+ <component id="lcservice" name="Location Centre Service Project" filter="s60" introduced="^3">
+ <unit bldFile="locationcentre/lcservice/group"/>
+ </component>
+ <component id="lcserver" name="Location Centre Server Project" filter="s60" introduced="^3">
+ <unit bldFile="locationcentre/lcserver/group"/>
+ </component>
+ <component id="lcapp" name="Location Centre Application" filter="s60" introduced="^3">
+ <unit bldFile="locationcentre/lcapp/group"/>
+ </component>
+ <component id="locationcentre_build" filter="s60" name="Location Centre Build" introduced="^3">
+ <!-- consider distributing this into the other components or collapsing into a single component -->
+ <unit bldFile="locationcentre/group" />
+ </component>
+</collection>
<collection id="location_info" name="Location Apps Info" level="loc">
- <component id="location_test" filter="s60" purpose="development" name="Location Apps Test">
- <!-- should this be uncommented? -->
- <!-- <unit bldFile="tsrc/group"/> -->
- </component>
<component id="loc_pub" filter="s60" class="api" name="Location Apps Public Interfaces">
<unit bldFile="loc_pub/group"/>
- <!-- what to do with these test units? -->
- <!-- <unit bldFile="loc_pub/landmarks_ui_addedit_api/tsrc/bc/group"/> -->
- <!-- <unit bldFile="loc_pub/landmarks_ui_addedit_api/tsrc/group"/> -->
- <!-- <unit bldFile="loc_pub/landmarks_ui_selector_api/tsrc/bc/group"/> -->
- <!-- <unit bldFile="loc_pub/landmarks_ui_selector_api/tsrc/group"/> -->
+ </component>
+ <component id="loc_plat" filter="s60" class="api" name="Location Apps Platform Interfaces" introduced="^3">
+ <unit bldFile="loc_plat/group"/>
</component>
</collection>
</package>
--- a/symbian3/app/messaging/package_definition_3.0.xml Wed Feb 03 19:36:09 2010 +0000
+++ b/symbian3/app/messaging/package_definition_3.0.xml Wed Feb 03 20:06:22 2010 +0000
@@ -25,8 +25,6 @@
</component>
<component id="smsui" filter="s60" name="SMS UI">
<unit bldFile="mobilemessaging/smsui/group"/>
- <!-- does this bld.inf need to be included in the group one? -->
- <!-- <unit bldFile="mobilemessaging/smsui/viewer"/> -->
</component>
<component id="smsmtm" name="SMS MTM" purpose="optional" class="plugin">
<unit bldFile="mobilemessaging/smsmtm/group" mrp="mobilemessaging/smsmtm/group/messaging_sms.mrp"/>
@@ -104,10 +102,6 @@
</component>
<component id="sendui" filter="s60" name="Send UI" class="plugin">
<unit bldFile="messagingappbase/sendui/group"/>
- <!-- do these bld.infs need to be included in the group one? -->
- <!-- <unit bldFile="messagingappbase/sendui/drmlinksender/group"/> -->
- <!-- <unit bldFile="messagingappbase/sendui/genericmtmplugin/group"/> -->
- <!-- <unit bldFile="messagingappbase/sendui/meetingrequestsender/group"/> -->
</component>
<component id="smilengine" filter="s60" name="SMIL Engine">
<unit bldFile="messagingappbase/smilengine/group"/>
@@ -138,10 +132,6 @@
</component>
<component id="imum" filter="s60" name="Internet Mail UI MTM" class="plugin" deprecated="^3">
<unit bldFile="email/imum/group"/>
- <!-- do these bld.infs need to be included in the group one? -->
- <!-- <unit bldFile="email/imum/domainapi/group"/> -->
- <!-- <unit bldFile="email/imum/mtms/group"/> -->
- <!-- <unit bldFile="email/imum/utils/group"/> -->
</component>
<component id="mail" filter="s60" name="Mail Application" deprecated="^3">
<unit bldFile="email/mail/group"/>
@@ -154,29 +144,11 @@
</component>
</collection>
<collection id="messaging_info" name="Messaging Apps Info" level="ui">
- <component id="messaging_test" filter="s60" name="Messaging Apps Test" purpose="development">
- <!-- <unit bldFile="tsrc/group"/> -->
- </component>
<component id="msg_plat" name="Messaging Apps Platform APIs" filter="s60" class="api">
<unit bldFile="msg_plat/group"/>
- <unit bldFile="msg_plat/messaging_center_ui_utilities_api/tsrc/group"/>
- <unit bldFile="msg_plat/messaging_editor_api/tsrc/group"/>
- <unit bldFile="msg_plat/messaging_media_resolver_api/tsrc/group"/>
- <unit bldFile="msg_plat/mms_application_api/tsrc/group"/>
- <unit bldFile="msg_plat/mms_codec_client_api/tsrc/group"/>
- <unit bldFile="msg_plat/mms_conformance_api/tsrc/group"/>
- <unit bldFile="msg_plat/mms_server_settings_api/tsrc/group"/>
- <!-- <unit bldFile="msg_plat/email_domain_utilities_api/tsrc/group"/> -->
- <!-- <unit bldFile="msg_plat/send_ui_meeting_request_api/tsrc/group"/> -->
- <unit bldFile="msg_plat/smil_engine_api/tsrc/group"/>
- <unit bldFile="msg_plat/unified_editor_video_conversion_api/tsrc/group"/>
</component>
<component id="msg_pub" name="Messaging Apps Public APIs" filter="s60" class="api">
<unit bldFile="msg_pub/group"/>
- <unit bldFile="msg_pub/mms_client_mtm_api/tsrc/group"/>
- <unit bldFile="msg_pub/plugin_bio_control_api/tsrc/group"/>
- <!-- <unit bldFile="msg_pub/mms_client_mtm_api/tsrc/bc/group"/> -->
- <!-- <unit bldFile="msg_pub/plugin_bio_control_api/tsrc/bc/group"/> -->
</component>
<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"/>
--- a/symbian3/app/mmsharinguis/package_definition_3.0.xml Wed Feb 03 19:36:09 2010 +0000
+++ b/symbian3/app/mmsharinguis/package_definition_3.0.xml Wed Feb 03 20:06:22 2010 +0000
@@ -4,37 +4,24 @@
<collection id="mmsharing" name="Multimedia Sharing" level="base">
<component id="mmshavailability" filter="s60" name="Multimedia Sharing Availability">
<unit bldFile="mmsharing/mmshavailability/group"/>
- <!-- is this test unit needed? -->
- <!-- <unit bldFile="mmsharing/mmshavailability/tsrc/ut_availability/group"/> -->
</component>
<component id="mmshindicator" filter="s60" name="Multimedia Sharing Indicator">
<unit bldFile="mmsharing/mmshindicator/group"/>
- <!-- are these test units needed? -->
- <!-- <unit bldFile="mmsharing/mmshindicator/tsrc/indicatortestapp/group"/> -->
- <!-- <unit bldFile="mmsharing/mmshindicator/tsrc/ut_indicator/group"/> -->
</component>
<!-- consider putting client and server in the same component -->
<component id="mmshmanagercli" filter="s60" name="Multimedia Sharing Manager Client">
<unit bldFile="mmsharing/mmshmanagercli/group"/>
- <!-- is this test unit needed? -->
- <!-- <unit bldFile="mmsharing/mmshmanagercli/tsrc/ut_managercli/group"/> -->
</component>
<component id="mmshmanagersrv" filter="s60" name="Multimedia Sharing Manager Server">
<unit bldFile="mmsharing/mmshmanagersrv/group"/>
- <!-- is this test unit needed? -->
- <!-- <unit bldFile="mmsharing/mmshmanagersrv/tsrc/ut_managersrv/group"/> -->
</component>
<component id="mmshengine" filter="s60" name="Multimedia Sharing Engine">
<unit bldFile="mmsharing/mmshengine/group"/>
- <!-- is this test unit needed? -->
- <!-- <unit bldFile="mmsharing/mmshengine/tsrc/ut_engine/group"/> -->
</component>
<component id="mmshui" filter="s60" name="Multimedia Sharing UI">
<!-- can only have one unti: need to #include one from the other if it's needed -->
<unit bldFile="mmsharing/mmshui/group"/>
<unit bldFile="mmsharing/mmshui/help/group"/>
- <!-- is this test unit needed? -->
- <!-- <unit bldFile="mmsharing/mmshui/tsrc/ut_ui/group"/> -->
</component>
<component id="mmsharing_build" filter="s60" name="MM Sharing Build">
<unit bldFile="mmsharing/group"/>
@@ -43,31 +30,18 @@
<collection id="mmshplugins" name="Multimedia Sharing Plugins" level="plugin">
<component id="mmshaoplugin" filter="s60" name="Multimedia Sharing Always Online Plugin" class="plugin">
<unit bldFile="mmshplugins/mmshaoplugin/group"/>
- <!-- <unit bldFile="mmshplugins/mmshaoplugin/tsrc/ut_aoplugin/group"/> -->
</component>
<component id="mmshaiwplugin" filter="s60" name="Multimedia Sharing AIW Plugin" class="plugin">
<unit bldFile="mmshplugins/mmshaiwplugin/group"/>
- <!-- <unit bldFile="mmshplugins/mmshaiwplugin/tsrc/ut_aiwplugin/group"/> -->
</component>
<component id="mmshsipcrplugin" filter="s60" name="Multimedia Sharing SIP Client Resolver Plugin" class="plugin">
<unit bldFile="mmshplugins/mmshsipcrplugin/group"/>
- <!-- <unit bldFile="mmshplugins/mmshsipcrplugin/tsrc/ut_sipcrplugin/group"/> -->
</component>
<component id="mmshsettingsuiplugin" filter="s60" name="Multimedia Sharing Settings UI Plugin" class="plugin">
<unit bldFile="mmshplugins/mmshsettingsuiplugin/group"/>
</component>
<component id="mmshwpadapterplugin" filter="s60" name="Multimedia Sharing WAP Provisioning Adapter" class="plugin">
<unit bldFile="mmshplugins/mmshwpadapterplugin/group"/>
- <!-- <unit bldFile="mmshplugins/mmshwpadapterplugin/tsrc/ut_wpadapterplugin/group"/> -->
- </component>
- <component id="mmcctranscoder" filter="s60" name="MMCC Transcoder" class="plugin">
- <!-- MMCC? What's that stand for? -->
- <unit bldFile="mmshplugins/mmcctranscoder/group"/>
- <!-- <unit bldFile="mmshplugins/mmcctranscoder/tsrc/stubs/group"/> -->
- <!-- <unit bldFile="mmshplugins/mmcctranscoder/tsrc/ut_transcoder/group"/> -->
- </component>
- <component id="mmshplugins_build" filter="s60" name="MM Sharing Plugins Build">
- <unit bldFile="mmshplugins/group"/>
</component>
</collection>
<collection id="mmsharinguis_info" name="Multimedia Sharing UIs Info" level="if">
@@ -77,7 +51,9 @@
</component>
<component id="mmsharinguis_plat" filter="s60" name="Multimedia Sharing UIs Platform Interfaces" class="api">
<unit bldFile="mmsharinguis_plat/group"/>
- <!-- <unit bldFile="mmsharinguis_plat/multimedia_sharing_manager_api/tsrc/group"/> -->
+ </component>
+ <component id="mmsharinguis_plat" filter="s60,api_test" name="Multimedia Sharing UIs API Tests" class="api">
+ <unit bldFile="mmsharinguis_plat/multimedia_sharing_manager_api/tsrc/group"/>
</component>
</collection>
</package>
--- a/symbian3/app/musicplayer/package_definition_3.0.xml Wed Feb 03 19:36:09 2010 +0000
+++ b/symbian3/app/musicplayer/package_definition_3.0.xml Wed Feb 03 20:06:22 2010 +0000
@@ -1,14 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<SystemDefinition schema="3.0.0">
<package id="musicplayer" name="Music Player Apps" levels="plugins support hs app">
- <collection id="musicvisualization" name="Music Visualization" level="plugins">
- <component id="musicvisualizationplugin" filter="s60" name="Music Visualization Plugin" class="plugin">
- <unit bldFile="musicvisualization/musicvisualizationplugin/group"/>
- </component>
- <component id="mpxvisualizationplugins" filter="s60" name="MPX Visualization Plugins" class="plugin">
- <unit bldFile="musicvisualization/mpxvisualizationplugins/group"/>
- </component>
- </collection>
+ <!-- custom filter pref_test-->
<collection id="mpxmusicplayer" name="MPX Music Player" level="app">
<component id="mpxmusicplayer_help" filter="s60" name="Help">
<unit bldFile="mpxmusicplayer/help/group"/>
@@ -16,10 +9,10 @@
<component id="mpxmusicplayer_commonui" filter="s60" name="MPX Common UI">
<unit bldFile="mpxmusicplayer/commonui/group"/>
</component>
- <component id="activeidle" filter="s60" name="MPX Active Idle">
+ <component id="mpx_activeidle" filter="s60" name="MPX Active Idle">
<unit bldFile="mpxmusicplayer/activeidle/group"/>
</component>
- <component id="metadatahandler" filter="s60" name="MPX Metadata Handler">
+ <component id="mpx_metadatahandler" filter="s60" name="MPX Metadata Handler">
<unit bldFile="mpxmusicplayer/metadatahandler/group"/>
</component>
<component id="mediakeyhandler" filter="s60" name="MPX Media Key Handler">
@@ -33,25 +26,28 @@
<unit bldFile="mpxmusicplayer/group"/>
</component>
</collection>
- <collection id="musichomescreen" name="Music Home Screen" level="hs">
+ <collection id="musichomescreen_multiview" name="Music Home Screen Multiview" level="hs">
+ <meta rel="config">
+ <defined condition="IAD_INCLUDE_ENHANCED_HOMESCREEN"/>
+ </meta>
<component id="mpxcollectionpublisher" filter="s60" name="MPX Collection Publisher" introduced="^2">
- <unit bldFile="musichomescreen/mpxcollectionpublisher/group"/>
+ <unit bldFile="musichomescreen_multiview/mpxcollectionpublisher/group"/>
</component>
<component id="musiccontentpublisher" filter="s60" name="Music Content Publisher" introduced="^2">
- <unit bldFile="musichomescreen/musiccontentpublisher/group"/>
+ <unit bldFile="musichomescreen_multiview/musiccontentpublisher/group"/>
</component>
<component id="mcpmusicplayer" filter="s60" name="Music Player MCP Plugin" class="plugin" introduced="^2">
- <unit bldFile="musichomescreen/mcpmusicplayer/group"/>
+ <unit bldFile="musichomescreen_multiview/mcpmusicplayer/group"/>
</component>
<component id="musicplayeractionhandlerplugin" filter="s60" name="Music Player Action Handler Plugin" class="plugin" introduced="^2">
- <unit bldFile="musichomescreen/musicplayeractionhandlerplugin/group"/>
+ <unit bldFile="musichomescreen_multiview/musicplayeractionhandlerplugin/group"/>
</component>
- <component id="data" filter="s60" name="MPX Data" introduced="^2">
- <!-- does this make sense to be a component? should it just be #include from musichomescreen/group? -->
- <unit bldFile="musichomescreen/data/themes/default/group"/>
+ <component id="mpx_data" filter="s60" name="MPX Data" introduced="^2">
+ <!-- does this make sense to be a component? should it just be #include from musichomescreen_multiview/group? -->
+ <unit bldFile="musichomescreen_multiview/data/themes/default/group"/>
</component>
- <component id="musichomescreen_build" filter="s60" name="Music Homescreen Build" introduced="^2">
- <unit bldFile="musichomescreen/group"/>
+ <component id="musichomescreen_build" filter="s60" name="Music Homescreen Multiview Build" introduced="^2">
+ <unit bldFile="musichomescreen_multiview/group"/>
</component>
</collection>
<collection id="mpxplugins" name="MPX Plugins" level="plugins">
@@ -67,18 +63,15 @@
</component>
</collection>
<collection id="musicplayer_info" name="Music Player Apps Info" level="app">
+ <component id="musicplayer_build" filter="s60" name="Music Player Build">
+ <!-- should explicitly #inlcude musicplayerbldvariant.hrh in each component -->
+ <unit bldFile="group"/>
+ </component>
<component id="musicplayer_plat" filter="s60" name="Music Player Apps Platform Interfaces" class="api">
<unit bldFile="musicplayer_plat/group"/>
- <!-- can only have one unit. Need to #include the rest from the above -->
- <unit bldFile="musicplayer_plat/mpx_music_player_app_api/tsrc/group"/>
- <unit bldFile="musicplayer_plat/mpx_music_player_commonui_api/tsrc/group"/>
- <unit bldFile="musicplayer_plat/mpx_music_player_media_key_handler_api/tsrc/group"/>
- <unit bldFile="musicplayer_plat/mpx_music_store_api/tsrc/group"/>
- <unit bldFile="musicplayer_plat/music_visualization_plugin_api/tsrc/group"/>
</component>
- <component id="musicplayer_test" filter="s60" purpose="development" name="Music Player Apps Test">
- <!-- should this be uncommented? -->
- <!-- <unit bldFile="tsrc/group"/> -->
+ <component id="musicplayer_test" filter="s60,pref_test,api_test" purpose="development" name="Music Player Apps Test">
+ <unit bldFile="tsrc/group"/>
</component>
</collection>
</package>
--- a/symbian3/app/organizer/package_definition_3.0.xml Wed Feb 03 19:36:09 2010 +0000
+++ b/symbian3/app/organizer/package_definition_3.0.xml Wed Feb 03 20:06:22 2010 +0000
@@ -1,7 +1,49 @@
<?xml version="1.0" encoding="UTF-8"?>
<SystemDefinition schema="3.0.0">
<package id="organizer" name="Organizer Application Suite" levels="support services engine ui app">
+ <collection id="alarmengines" name="Alarm Engines" level="engine">
+ <component id="missedalarmstore" filter="s60" name="Missed Alarm Store">
+ <unit bldFile="alarmengines/missedalarmstore/group"/>
+ </component>
+ </collection>
+ <collection id="calendarengines" name="Calendar Engines" level="engine">
+ <component id="versit2" filter="s60" name="Versit 2 iCal Parser" introduced="9.2">
+ <unit bldFile="calendarengines/versit2/group"/>
+ </component>
+ <component id="agnversit2" filter="s60" name="Versit 2 Agenda Interface" class="plugin" introduced="9.2">
+ <unit bldFile="calendarengines/agnversit2/group"/>
+ </component>
+ <component id="caleninterimutils" filter="s60" name="Calendar Interim Utils" introduced="9.1">
+ <unit bldFile="calendarengines/caleninterimutils/group"/>
+ </component>
+ <component id="calenimp" filter="s60" name="Calendar Import Wrapper" introduced="7.0s">
+ <unit bldFile="calendarengines/calenimp/group"/>
+ </component>
+ <component id="calenlauncher" filter="s60" name="Calendar Launcher">
+ <unit bldFile="calendarengines/calenlauncher/group"/>
+ </component>
+ </collection>
+ <collection id="meetingrequestengines" name="Meeting Request Engines" level="engine">
+ <component id="mrmailbox" filter="s60" name="Meeting Request Mailbox">
+ <unit bldFile="meetingrequestengines/mrmailbox/group"/>
+ </component>
+ <component id="mrmailboxutils" filter="s60" name="Meeting Request Mailbox Utils" class="plugin">
+ <unit bldFile="meetingrequestengines/mrmailboxutils/group"/>
+ </component>
+ </collection>
+ <collection id="searchfw" name="Search Framework" level="services">
+ <meta rel="config">
+ <defined condition="RD_GENERAL_SEARCH"/>
+ </meta>
+ <component id="coresearchfw" filter="s60" name="Core Search Framework" introduced="^1">
+ <unit bldFile="searchfw/coresearchfw/group"/>
+ </component>
+ <component id="searchfw_plugins" filter="s60" name="Search Plugins" class="plugin" introduced="^1">
+ <unit bldFile="searchfw/plugins/group"/>
+ </component>
+ </collection>
<collection id="alarmui" name="Alarm UI" level="app">
+ <!-- collection is really a component, should move down a directory -->
<component id="alarmui_build" filter="s60" name="Alarm UI Build">
<unit bldFile="alarmui/group"/>
</component>
@@ -27,16 +69,19 @@
<component id="customisationmanager" filter="s60" name="Calendar Customisation Manager">
<unit bldFile="calendarui/customisationmanager/group"/>
</component>
+ <component id="multicaluidialog" filter="s60" name="Multi-Calendar UI Dialog" introduced="^3">
+ <unit bldFile="calendarui/multicaluidialog/group"/>
+ </component>
<component id="views" filter="s60" name="Calendar Views">
<unit bldFile="calendarui/views/group"/>
</component>
<component id="calendarui_controller" filter="s60" name="Calendar Controller">
<unit bldFile="calendarui/controller/group"/>
</component>
- <component id="editors" filter="s60" name="Calendar Editors">
+ <component id="calendarui_editors" filter="s60" name="Calendar Editors">
<unit bldFile="calendarui/editors/group"/>
</component>
- <component id="application" filter="s60" name="Calendar Application">
+ <component id="calendarui_application" filter="s60" name="Calendar Application">
<unit bldFile="calendarui/application/group"/>
</component>
<component id="missedalarmindicatorplugin" filter="s60" name="Missed Alarm Indicator Plugin" class="plugin">
@@ -54,23 +99,12 @@
<unit bldFile="calendarui/regionalplugins/lunarvietnamese/group"/>
<unit bldFile="calendarui/regionalplugins/thai/group"/>
</component>
- <component id="calendarui_build" filter="s60" name="Calendar UI Build">
- <unit bldFile="calendarui/group"/>
- </component>
- </collection>
- <collection id="clock2" name="Clock" level="app">
- <component id="clockengines" filter="s60" name="Clock Engines">
- <unit bldFile="clock2/clockengines/group"/>
+ <component id="calenaiwprovider" filter="s60" name="Calendar AIW Proivder" class="plugin" introduced="^3">
+ <unit bldFile="calendarui/calenaiwprovider/group"/>
</component>
- <component id="clockui" filter="s60" name="Clock UI">
- <unit bldFile="clock2/clockui/group"/>
- <!-- <unit bldFile="clock2/clockui/plugins/datetimeviewplugin/group"/> -->
- </component>
- <component id="clock2_help" filter="s60" name="Clock Help">
- <unit bldFile="clock2/help/group"/>
- </component>
- <component id="clock2_build" filter="s60" name="Clock Build">
- <unit bldFile="clock2/group"/>
+ <component id="calendarui_build" filter="s60" name="Calendar UI Build">
+ <!-- split contents into separate components -->
+ <unit bldFile="calendarui/group"/>
</component>
</collection>
<collection id="meetingui" name="Meeting UI" level="ui">
@@ -87,8 +121,24 @@
<unit bldFile="meetingui/meetingrequestviewers/group"/>
</component>
<component id="meetingui_build" filter="s60" name="Meeting UI Build">
+ <!-- split contents into separate components -->
<unit bldFile="meetingui/group"/>
</component>
+ </collection>
+ <collection id="clock2" name="Clock" level="app">
+ <component id="clockengines" filter="s60" name="Clock Engines">
+ <unit bldFile="clock2/clockengines/group"/>
+ </component>
+ <component id="clockui" filter="s60" name="Clock UI">
+ <unit bldFile="clock2/clockui/group"/>
+ </component>
+ <component id="clock2_help" filter="s60" name="Clock Help">
+ <unit bldFile="clock2/help/group"/>
+ </component>
+ <component id="clock2_build" filter="s60" name="Clock Build">
+ <!-- split contents into separate components, or just make this one component -->
+ <unit bldFile="clock2/group"/>
+ </component>
</collection>
<collection id="notepad" name="Notepad" level="ui">
<component id="notepad_help" filter="s60" name="Notepad Help">
@@ -96,67 +146,20 @@
</component>
<component id="notepad1" filter="s60" name="Notepad Application 1">
<unit bldFile="notepad/notepad1/group"/>
- <!-- <unit bldFile="notepad/notepad1/syncmladapter/group"/> -->
</component>
<component id="txtrecog" filter="s60" name="Text Recognizer" class="plugin">
<unit bldFile="notepad/txtrecog/group"/>
</component>
- <component id="notepad_build" filter="s60" name="Notepad Build">
- <unit bldFile="notepad/group"/>
- </component>
</collection>
- <collection id="searchui" name="Search UI" level="app">
+ <collection id="searchui" name="Search UI" level="app"> <!-- consider making this a single component -->
+ <meta rel="config">
+ <defined condition="RD_GENERAL_SEARCH"/>
+ </meta>
<component id="searchui_help" filter="s60" name="Search UI Help">
<unit bldFile="searchui/help/group"/>
</component>
<component id="searchapp" filter="s60" name="Search Application">
<unit bldFile="searchui/searchapp/group"/>
- <!-- <unit bldFile="searchui/searchapp/plugins/searchsettingsplugin/group"/> -->
- <!-- <unit bldFile="searchui/searchapp/plugins/srchuisettingsplugin/group"/> -->
- </component>
- <component id="searchui_build" filter="s60" name="Search UI Build">
- <unit bldFile="searchui/group"/>
- </component>
- </collection>
- <collection id="calendarengines" name="Calendar Engines" level="engine">
- <component id="versit2" filter="s60" name="Versit 2 iCal Parser" introduced="9.2">
- <unit bldFile="calendarengines/versit2/group"/>
- </component>
- <component id="agnversit2" filter="s60" name="Versit 2 Agenda Interface" class="plugin" introduced="9.2">
- <unit bldFile="calendarengines/agnversit2/group"/>
- </component>
- <component id="caleninterimutils" filter="s60" name="Calendar Interim Utils" introduced="9.1">
- <unit bldFile="calendarengines/caleninterimutils/group"/>
- </component>
- <component id="calenimp" filter="s60" name="Calendar Import Wrapper" introduced="7.0s">
- <unit bldFile="calendarengines/calenimp/group"/>
- </component>
- <component id="calenlauncher" filter="s60" name="Calendar Launcher">
- <unit bldFile="calendarengines/calenlauncher/group"/>
- </component>
- <component id="calendarengines_build" filter="s60" name="Calendar Engines Build">
- <unit bldFile="calendarengines/group"/>
- </component>
- </collection>
- <collection id="meetingrequestengines" name="Meeting Request Engines" level="engine">
- <component id="mrmailbox" filter="s60" name="Meeting Request Mailbox">
- <unit bldFile="meetingrequestengines/mrmailbox/group"/>
- </component>
- <component id="mrmailboxutils" filter="s60" name="Meeting Request Mailbox Utils" class="plugin">
- <unit bldFile="meetingrequestengines/mrmailboxutils/group"/>
- </component>
- </collection>
- <collection id="alarmengines" name="Alarm Engines" level="engine">
- <component id="missedalarmstore" filter="s60" name="Missed Alarm Store">
- <unit bldFile="alarmengines/missedalarmstore/group"/>
- </component>
- </collection>
- <collection id="searchfw" name="Search Framework" level="services">
- <component id="coresearchfw" filter="s60" name="Core Search Framework" introduced="^1">
- <unit bldFile="searchfw/coresearchfw/group"/>
- </component>
- <component id="searchfw_plugins" filter="s60" name="Search Plugins" class="plugin" introduced="^1">
- <unit bldFile="searchfw/plugins/group"/>
</component>
</collection>
<collection id="pimappservices" name="PIM Application Services" level="services">
@@ -181,16 +184,9 @@
<collection id="organizer_info" name="Organizer Application Suite Info" level="app">
<component id="organizer_pub" filter="s60" name="Organizer Application Suite Public Interfaces" class="api">
<unit bldFile="organizer_pub/group"/>
- <!-- <unit bldFile="organizer_pub/calendar_interim_utils2_api/tsrc/group"/> -->
- <!-- <unit bldFile="organizer_pub/notepad_library_api/tsrc/group"/> -->
</component>
<component id="organizer_plat" filter="s60" name="Organizer Application Suite Platform Interfaces" class="api">
<unit bldFile="organizer_plat/group"/>
- <!-- <unit bldFile="organizer_plat/agenda_versit_2_api/tsrc/group"/> -->
- <!-- <unit bldFile="organizer_plat/calendar_exporter_api/tsrc/group"/> -->
- <!-- <unit bldFile="organizer_plat/calendar_importer_api/tsrc/group"/> -->
- <!-- <unit bldFile="organizer_plat/common_alarm_editor_api/tsrc/group"/> -->
- <!-- <unit bldFile="organizer_plat/meeting_request_mailbox_utilities_api/tsrc/group"/> -->
</component>
<component id="organizer_metadata" name="Organizer Application Suite Metadata" class="config" introduced="^2" purpose="development" target="desktop">
<unit mrp="organizer_info/organizer_metadata/organizer_metadata.mrp"/>
--- a/symbian3/app/phone/package_definition_3.0.xml Wed Feb 03 19:36:09 2010 +0000
+++ b/symbian3/app/phone/package_definition_3.0.xml Wed Feb 03 20:06:22 2010 +0000
@@ -7,9 +7,6 @@
</component>
<component id="phoneui" filter="s60" name="Phone UI">
<unit bldFile="phoneapp/phoneui/group"/>
- <!-- should these be separate components? #included? -->
- <!-- <unit bldFile="phoneapp/phoneui/tsrc/public/basic/3dringingtoneinterface_tests/group"/> -->
- <!-- <unit bldFile="phoneapp/phoneui/tsrc/public/basic/group"/> -->
</component>
<component id="phoneuicontrol" filter="s60" name="Phone UI Control">
<unit bldFile="phoneapp/phoneuicontrol/group"/>
@@ -32,6 +29,9 @@
<component id="phonemediatorcenter" filter="s60" name="Phone Mediator Center">
<unit bldFile="phoneapp/phonemediatorcenter/group"/>
</component>
+ <component id="phoneapp_api_test" filter="s60,api_test" name="Phone App API Tests">
+ <unit bldFile="phoneapp/phoneui/tsrc/public/basic/group"/>
+ </component>
</collection>
<collection id="phoneengine" name="Phone Engine" level="engine">
<component id="phonecntfinder" filter="s60" name="Phone Contact Finder">
@@ -70,8 +70,6 @@
<collection id="phoneuis" name="Phone UIs" level="ui">
<component id="dialer" filter="s60" name="Dialer">
<unit bldFile="phoneuis/dialer/group"/>
- <!-- what to do about this test unit? -->
- <!-- <unit bldFile="phoneuis/dialer/tsrc/public/basic/group"/> -->
</component>
<component id="bubblemanager" filter="s60" name="Phone Bubble Manager">
<unit bldFile="phoneuis/bubblemanager/group"/>
@@ -79,11 +77,6 @@
<component id="connectutil" filter="s60" name="Connection Utility" class="plugin">
<unit bldFile="phoneuis/connectutil/group"/>
</component>
- <component id="sfiutils" filter="s60" name="Send File In Call Utilities" class="plugin">
- <unit bldFile="phoneuis/sfiutils/group"/>
- <!-- what to do about this test unit? -->
- <!-- <unit bldFile="phoneuis/sfiutils/tsrc/public/basic/group"/> -->
- </component>
<component id="ussd" filter="s60" name="Unstructured Supplementary Services Data">
<unit bldFile="phoneuis/ussd/group"/>
</component>
@@ -93,6 +86,9 @@
<component id="telephonydevicemode" filter="s60" name="Telephony Device Mode">
<unit bldFile="phoneuis/telephonydevicemode/group"/>
</component>
+ <component id="phoneuis_api_test" filter="s60,api_test" name="Phone UIs API Tests">
+ <unit bldFile="phoneuis/dialer/tsrc/public/basic/group"/>
+ </component>
</collection>
<collection id="phone_info" name="Phone Apps Info" level="app">
<component id="phone_plat" filter="s60" name="Phone Apps Platform Interfaces" class="api">
@@ -106,3 +102,4 @@
</collection>
</package>
</SystemDefinition>
+
--- a/symbian3/app/printing/package_definition_3.0.xml Wed Feb 03 19:36:09 2010 +0000
+++ b/symbian3/app/printing/package_definition_3.0.xml Wed Feb 03 20:06:22 2010 +0000
@@ -7,19 +7,12 @@
</component>
<component id="imageprintengine" filter="s60" name="ImagePrint Engine" introduced="^2">
<unit bldFile="imageprint/imageprintengine/group"/>
- <!-- do these other bld.infs need to be #included? -->
- <!-- <unit bldFile="imageprint/imageprintengine/deviceprotocols/btprotocol/group"/> -->
- <!-- <unit bldFile="imageprint/imageprintengine/deviceprotocols/dpof/group"/> -->
- <!-- <unit bldFile="imageprint/imageprintengine/deviceprotocols/pictbridge2/group"/> -->
- <!-- <unit bldFile="imageprint/imageprintengine/deviceprotocols/upnpprotocolfw2/group"/> -->
- <!-- <unit bldFile="imageprint/imageprintengine/deviceprotocols/xhtmlfilecomposer/group"/> -->
- <!-- <unit bldFile="imageprint/imageprintengine/imageprintserver/group"/> -->
</component>
<component id="imageprintui" filter="s60" name="ImagePrint UI" introduced="^2">
<unit bldFile="imageprint/imageprintui/group"/>
</component>
<component id="imageprint_build" filter="s60" name="ImagePrint Build" introduced="^2">
- <!-- Need to break the IBY includes into the other components -->
+ <!-- Need to break the IBY includes into the other components, or remove #includes and make this a ROM component -->
<unit bldFile="imageprint/group"/>
</component>
</collection>
--- a/symbian3/app/profile/package_definition_3.0.xml Wed Feb 03 19:36:09 2010 +0000
+++ b/symbian3/app/profile/package_definition_3.0.xml Wed Feb 03 20:06:22 2010 +0000
@@ -4,26 +4,18 @@
<collection id="profilesapplication" name="Profiles Application" level="app">
<component id="profiles" filter="s60" name="Profiles">
<unit bldFile="profilesapplication/profiles/group"/>
- <!-- this can only have one unit. can the test be #included? -->
- <unit bldFile="profilesapplication/profiles/profileapp/tsrc/public/basic/group"/>
- <!-- should these be #included? -->
- <!-- <unit bldFile="profilesapplication/profiles/gsprofilesplugin/group"/> -->
- <!-- <unit bldFile="profilesapplication/profiles/profileaiwprovider/group"/> -->
- <!-- <unit bldFile="profilesapplication/profiles/profileapp/group"/> -->
- <!-- <unit bldFile="profilesapplication/profiles/profilesgstonesplugin/group"/> -->
</component>
- <component id="profilesapplication_test" filter="s60" purpose="development" name="Profiles Application Test">
- <!-- does this need to be built? -->
- <!-- <unit bldFile="profilesapplication/tsrc/public/basic/group"/> -->
- </component>
- <component id="profile_help" filter="s60" name="Profiles Help">
- <unit bldFile="help/group"/>
+ <component id="profilesapplication_test" filter="s60,api_test" purpose="development" name="Profiles Application Test">
+ <unit bldFile="profilesapplication/tsrc/public/basic/group"/>
</component>
</collection>
<collection id="profile_info" name="Profiles Info" level="app">
<component id="profile_plat" filter="s60" name="Profiles Platform Interfaces" class="api">
<unit bldFile="profile_plat/group"/>
</component>
+ <component id="profile_help" filter="s60" name="Profiles Help">
+ <unit bldFile="help/group"/>
+ </component>
</collection>
</package>
</SystemDefinition>
--- a/symbian3/app/radio/package_definition_3.0.xml Wed Feb 03 19:36:09 2010 +0000
+++ b/symbian3/app/radio/package_definition_3.0.xml Wed Feb 03 20:06:22 2010 +0000
@@ -14,10 +14,13 @@
<component id="fmradiomcpplugin" filter="s60" name="FM Radio Content Publisher Plugin" class="plugin">
<unit bldFile="fmradio/fmradiomcpplugin/group"/>
</component>
+ <component id="fmradio_build" filter="s60" name="FM Radio Build">
+ <unit bldFile="fmradio/fmradio/group"/>
+ </component>
<component id="fmradio_help" filter="s60" name="FM Radio Help">
<unit bldFile="fmradio/help/group"/>
</component>
- <component id="fmradio_build" filter="s60" name="FM Radio Build">
+ <component id="fmradio_build" filter="s60" name="FM Radio ROM">
<!-- remove above #included bld.infs -->
<unit bldFile="fmradio/group"/>
</component>
--- a/symbian3/app/rndtools/package_definition_3.0.xml Wed Feb 03 19:36:09 2010 +0000
+++ b/symbian3/app/rndtools/package_definition_3.0.xml Wed Feb 03 20:06:22 2010 +0000
@@ -2,6 +2,7 @@
<SystemDefinition schema="3.0.0">
<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 -->
<component id="creator_build" filter="s60" name="Creator Tool" purpose="development" target="device" class="tool">
<unit bldFile="creator/group"/>
</component>
@@ -9,21 +10,44 @@
<collection id="filebrowser" name="File Browser" level="util">
<!-- consider collapsing into a single component -->
<component id="fileopserver" filter="s60" name="File Operations Server" purpose="development" target="device" class="tool">
- <unit bldFile="filebrowser/fileopserver/group"/>
+ <meta rel="config">
+ <not-defined condition="FILEBROWSER_LITE"/>
+ </meta>
+ <!-- uncomment the unit when configuration is in place, it's currently #included from filebrowser_build -->
+ <!-- <unit bldFile="filebrowser/fileopserver/group"/>-->
</component>
<component id="fileopclient" filter="s60" name="File Operations Client" purpose="development" target="device" class="tool">
- <unit bldFile="filebrowser/fileopclient/group"/>
+ <meta rel="config">
+ <not-defined condition="FILEBROWSER_LITE"/>
+ </meta>
+ <!-- uncomment the unit when configuration is in place, it's currently #included from filebrowser_build -->
+ <!--<unit bldFile="filebrowser/fileopclient/group"/>-->
</component>
<component id="filebrowser_build" filter="s60" name="File Browser Application" purpose="development" target="device" class="tool">
+ <!-- Need to make this a self-contained component by removing #includes. Can only do when configuration is in place-->
<unit bldFile="filebrowser/group"/>
</component>
</collection>
<collection id="launcher" name="Launcher" level="util">
+ <!-- collection is really a component. Should move down a directory -->
<component id="launcher_build" filter="s60" name="Launcher Utility" purpose="development" target="device" class="tool">
<unit bldFile="launcher/group"/>
</component>
</collection>
+ <collection id="loadgen" name="Load Generator" level="test">
+ <!-- collection is really a component. Should move down a directory -->
+ <component id="loadgen_build" filter="s60" name="Load Generator Application" purpose="development" target="device" class="tool">
+ <unit bldFile="loadgen/group"/>
+ </component>
+ </collection>
+ <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"/>
+ </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"/>
</component>
@@ -36,18 +60,14 @@
<unit bldFile="stifui/uitestserverstarter/group"/>
</component>
<component id="stifui_build" filter="s60" name="STIF UI Build" purpose="development">
- <!-- can this be split up into the other components? -->
+ <!-- can this be split up into the other components or made a ROM component? -->
<unit bldFile="stifui/group"/>
</component>
</collection>
- <collection id="loadgen" name="Load Generator" level="test">
- <component id="loadgen_build" filter="s60" name="Load Generator Application" purpose="development" target="device" class="tool">
- <unit bldFile="loadgen/group"/>
- </component>
- </collection>
- <collection id="perfmon" name="Performance Monitor" level="test">
- <component id="perfmon_build" filter="s60" name="Performance Monitor Tool" purpose="development" target="device" class="tool">
- <unit bldFile="perfmon/group"/>
+ <collection id="memspyui" name="Memspy UI" level="generic">
+ <!-- collection is really a component. Should move down a directory -->
+ <component id="memspyui_build" filter="s60" name="Memspy UI Application" purpose="development" target="device" class="tool">
+ <unit bldFile="memspyui/group"/>
</component>
</collection>
<collection id="htiui" name="Harmonized Test Interface UI" level="generic">
@@ -75,14 +95,9 @@
<unit bldFile="htiui/htiadmin/group"/>
</component>
<component id="htiui_build" filter="s60" name="HTI UI Build" purpose="development">
- <!-- can this be split up into the other components? -->
+ <!-- can this be split up into the other components or made a ROM component? -->
<unit bldFile="htiui/group"/>
</component>
</collection>
- <collection id="memspyui" name="Memspy UI" level="generic">
- <component id="memspyui_build" filter="s60" name="Memspy UI Application" purpose="development" target="device" class="tool">
- <unit bldFile="memspyui/group"/>
- </component>
- </collection>
</package>
</SystemDefinition>
--- a/symbian3/mw/accesssec/package_definition_3.0.xml Wed Feb 03 19:36:09 2010 +0000
+++ b/symbian3/mw/accesssec/package_definition_3.0.xml Wed Feb 03 20:06:22 2010 +0000
@@ -3,6 +3,7 @@
<package id="accesssec" name="Access Security" levels="plugin framework server generic specific">
<collection id="wlansecuritysettings" name="WLAN Security Settings" level="specific">
<component id="wapisecuritysettingsui" filter="s60" name="WAPI Security Settings UI" introduced="9.1">
+ <!-- the directory for this needs to be moved up to the right level -->
<unit bldFile="wlansecuritysettings/wapisecuritysettingsui/stub/group"/>
</component>
<component id="wepsecuritysettingsui" filter="s60" name="WEP Security Settings UI" introduced="9.1">
--- a/symbian3/mw/appinstall/package_definition_3.0.xml Wed Feb 03 19:36:09 2010 +0000
+++ b/symbian3/mw/appinstall/package_definition_3.0.xml Wed Feb 03 20:06:22 2010 +0000
@@ -1,15 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<SystemDefinition schema="3.0.0">
<package id="appinstall" name="Application Installation" levels="tool framework generic api">
- <collection id="appinstaller" name="Application Installer" level="generic">
- <component id="appmngr2" filter="s60" name="Application Manager 2" introduced="^2">
- <unit bldFile="appinstaller/appmngr2/group"/>
- </component>
- <component id="appinstui" filter="s60" name="Application Installer UI" introduced="^2">
- <unit bldFile="appinstaller/appinstui/group"/>
- </component>
- </collection>
<collection id="ncdengine" name="Nokia Content Discover" level="framework">
+ <!-- is this really just a component? If so move down one diretcory. Otherwise properly split up the bld.inf -->
<component id="ncdengine_engine" filter="s60" name="NCD Engine" introduced="^1">
<unit bldFile="ncdengine/engine/group"/>
</component>
@@ -20,12 +13,22 @@
<unit bldFile="ncdengine/group"/>
</component>
</collection>
+ <collection id="appinstaller" name="Application Installer" level="generic">
+ <component id="appmngr2" filter="s60" name="Application Manager 2" introduced="^2">
+ <unit bldFile="appinstaller/appmngr2/group"/>
+ </component>
+ <component id="appinstui" filter="s60" name="Application Installer UI" introduced="^2">
+ <unit bldFile="appinstaller/appinstui/group"/>
+ </component>
+ </collection>
<collection id="iaupdateapi_stub" name="IA Update API Stub" level="api">
+ <!-- the collection is really a component. Move down a directory.-->
<component id="iaupdateapi_stub_build" name="IA Update API Stub Build" filter="s60" introduced="^2">
<unit bldFile="iaupdateapi_stub/group"/>
</component>
</collection>
<collection id="iaupdate" name="Independent Apps Update" level="api">
+ <!-- is this really just a component? If so move down one diretcory. Otherwise properly split up the bld.inf -->
<component id="iad" name="Software Update" filter="s60" introduced="^2">
<unit bldFile="iaupdate/iad/group"/>
</component>
@@ -67,16 +70,12 @@
<collection id="appinstall_info" name="Application Installation Info" level="api">
<component id="appinstall_pub" filter="s60" name="Application Installation Public Interfaces" class="api">
<unit bldFile="appinstall_pub/group"/>
- <!-- <unit bldFile="appinstall_pub/startup_list_management_api/tsrc/bc/startuplistmanagementapi/selfsignedstartupapp/group"/> -->
- <!-- <unit bldFile="appinstall_pub/startup_list_management_api/tsrc/bc/startuplistmanagementapi/startupapp/group"/> -->
</component>
<component id="appinstall_plat" filter="s60" name="Application Installation Platform Interfaces" class="api">
<unit bldFile="appinstall_plat/group"/>
- <unit bldFile="appinstall_plat/appmngr2runtimeapi/tsrc/group"/>
- <!-- <unit bldFile="appinstall_plat/appmngr2runtimeapi/tsrc/data_src/sistest"/> -->
</component>
- <component id="appinstall_test" filter="s60" name="Application Installation Test" purpose="development">
- <!-- <unit bldFile="tsrc/group"/> -->
+ <component id="appinstall_test" filter="s60,api_test" name="Application Installation Test" purpose="development">
+ <unit bldFile="tsrc/group"/>
</component>
<component id="appinstall_metadata" name="Application Installation Metadata" class="config" introduced="^2" purpose="development" target="desktop">
<unit mrp="appinstall_info/appinstall_metadata/appinstall_metadata.mrp"/>
--- a/symbian3/mw/appsupport/package_definition_3.0.xml Wed Feb 03 19:36:09 2010 +0000
+++ b/symbian3/mw/appsupport/package_definition_3.0.xml Wed Feb 03 20:06:22 2010 +0000
@@ -1,61 +1,33 @@
<?xml version="1.0" encoding="UTF-8"?>
<SystemDefinition schema="3.0.0">
<package id="appsupport" name="Generic Application Support" levels="system plugin framework server generic specific">
- <collection id="sysresmonitoring" name="System Resource Monitoring" level="system">
- <component id="oodmonitor" filter="s60" name="OOD Monitor" introduced="7.0s">
- <unit bldFile="sysresmonitoring/oodmonitor/group"/>
- </component>
- <component id="oommonitor" filter="s60" name="OOM Monitor" introduced="7.0s">
- <unit bldFile="sysresmonitoring/oommonitor/group"/>
- <!-- <unit bldFile="sysresmonitoring/oommonitor/tsrc/public/basic/group"/> -->
- </component>
- </collection>
- <collection id="flashliteapi_3_1" name="Flash Lite API 3.1" level="specific">
- <component id="viewerfw" name="Flash Viewer Framework" filter="s60" class="api" introduced="^2">
- <!--no real bld.inf -->
- <unit base="flashliteapi_3_1/viewerfw"/>
- </component>
- </collection>
<collection id="contextframework" name="Context Framework" level="framework">
<component id="cfw" filter="s60" name="Context Framework">
+ <meta rel="config">
+ <defined condition="RD_CONTEXT_FRAMEWORK"/>
+ </meta>
<unit bldFile="contextframework/cfw/group"/>
- <!-- <unit bldFile="contextframework/cfw/tsrc/cfwtest/group"/> -->
- <!-- <unit bldFile="contextframework/cfw/tsrc/public/basic/group"/> -->
</component>
<component id="cfwplugins" filter="s60" name="Context Framework Plugins" class="plugin">
+ <meta rel="config">
+ <defined condition="RD_CONTEXT_FRAMEWORK"/>
+ </meta>
<unit bldFile="contextframework/cfwplugins/group"/>
</component>
- <component id="contextframework_build" filter="s60" name="Context Framework Build">
- <unit bldFile="contextframework/group"/>
- </component>
- </collection>
- <collection id="mediakeys" name="Media Keys" level="plugin">
- <component id="keypublisherplugin" filter="s60" name="Key Publisher Plugin" class="plugin">
- <!-- <unit bldFile="mediakeys/keypublisherplugin/group"/> -->
- </component>
- <component id="mmkeybearer" filter="s60" name="MM Key Bearer" class="plugin">
- <!-- <unit bldFile="mediakeys/mmkeybearer/group"/> -->
- </component>
- <component id="mediakeys_build" filter="s60" name="Media Keys Build">
- <unit bldFile="mediakeys/group"/>
- </component>
</collection>
<collection id="coreapplicationuis" name="Core Application UIs" level="server">
<component id="dbrecovery" filter="s60" name="Database Recovery">
<unit bldFile="coreapplicationuis/dbrecovery/group"/>
</component>
<component id="nspswsplugin" filter="s60" name="NSPS WS Plugin" class="plugin">
- <!-- No Service Power Save? Window Server?-->
+ <!-- No Service Power Save? Window Server? Please elaborate-->
<unit bldFile="coreapplicationuis/nspswsplugin/group"/>
</component>
<component id="rfs" filter="s60" name="Restore Factory Settings">
<unit bldFile="coreapplicationuis/rfs/group"/>
- <!-- <unit bldFile="coreapplicationuis/rfs/plugins/gsrfsplugin/group"/> -->
</component>
<component id="rfsplugins" filter="s60" name="Restore Factory Settings Plugins" class="plugin">
<unit bldFile="coreapplicationuis/rfsplugins/group"/>
- <!-- <unit bldFile="coreapplicationuis/rfsplugins/tsrc/rfspluginstest/group"/> -->
- <!-- <unit bldFile="coreapplicationuis/rfsplugins/tsrc/rfspluginstest/rfstestapp/group"/> -->
</component>
<component id="sysap" filter="s60" name="System Application">
<unit bldFile="coreapplicationuis/sysap/group"/>
@@ -71,44 +43,50 @@
</component>
<component id="advancedtspcontroller" filter="s60" name="Advanced TSP Controller">
<unit bldFile="coreapplicationuis/advancedtspcontroller/group"/>
- <!-- <unit bldFile="coreapplicationuis/advancedtspcontroller/tsrc/mt_atspc/group"/> -->
- <!-- <unit bldFile="coreapplicationuis/advancedtspcontroller/tsrc/stub/group"/> -->
</component>
<component id="powersaveutilities" filter="s60" name="Power Save Utilities">
<unit bldFile="coreapplicationuis/powersaveutilities/group"/>
- <!-- <unit bldFile="coreapplicationuis/powersaveutilities/tsrc/public/basic/group"/> -->
- </component>
- <component id="gsserver" filter="s60" name="General Settings Server">
- <unit bldFile="coreapplicationuis/gsserver/group"/>
- </component>
- <component id="gsserverengine" filter="s60" name="GS Server Engine">
- <unit bldFile="coreapplicationuis/gsserverengine/group"/>
</component>
<component id="gsserverenginestub" filter="s60" name="GS Server Engine Stub">
<unit bldFile="coreapplicationuis/gsserverenginestub/group"/>
</component>
+ <component id="gsserverengine" filter="s60" name="GS Server Engine">
+ <unit bldFile="coreapplicationuis/gsserverengine/group"/>
+ </component>
<component id="sensordatacompensatorplugin" filter="s60" name="Sensor Data Compensator Plugin" class="plugin">
<unit bldFile="coreapplicationuis/sensordatacompensatorplugin/group"/>
- <!-- <unit bldFile="coreapplicationuis/sensordatacompensatorplugin/tsrc/sensordatacompensatorplgtest/data/group"/> -->
- <!-- <unit bldFile="coreapplicationuis/sensordatacompensatorplugin/tsrc/sensordatacompensatorplgtest/group"/> -->
</component>
- <component id="coreapplicationuis_test" filter="s60" name="Core Application UIs Test" purpose="development">
- <!-- <unit bldFile="coreapplicationuis/tsrc/public/basic/group"/> -->
+ </collection>
+ <collection id="flashliteapi_3_1" name="Flash Lite API 3.1" level="specific">
+ <!-- collection is really a component. Move down a directory -->
+ <component id="flashliteapi_3_1_build" name="Flash Lite API Build" filter="s60" introduced="^2">
+ <unit base="flashliteapi_3_1/group"/>
+ </component>
+ </collection>
+ <collection id="mediakeys" name="Media Keys" level="plugin">
+ <!-- collection is really a component. Move down a directory -->
+ <component id="mediakeys_build" filter="s60" name="Media Keys Build">
+ <unit bldFile="mediakeys/group"/>
</component>
</collection>
<collection id="startupservices" name="Startup Services" level="system">
- <component id="startup" name="Startup Application" filter="s60">
- <unit bldFile="startupservices/startup/group"/>
- <!-- <unit bldFile="startupservices/startup/mediatorplugin/group"/> -->
- <!-- <unit bldFile="startupservices/startup/startupsyncplugin/group"/> -->
- <!-- <unit bldFile="startupservices/startup/systemerrorplugin/group"/> -->
- </component>
<component id="splashscreen" filter="s60" name="Splash Screen">
<unit bldFile="startupservices/splashscreen/group"/>
</component>
<component id="startupanimation" filter="s60" name="Startup Animation">
<unit bldFile="startupservices/startupanimation/group"/>
</component>
+ <component id="startup" name="Startup Application" filter="s60">
+ <unit bldFile="startupservices/startup/group"/>
+ </component>
+ </collection>
+ <collection id="sysresmonitoring" name="System Resource Monitoring" level="system">
+ <component id="oodmonitor" filter="s60" name="OOD Monitor" introduced="7.0s">
+ <unit bldFile="sysresmonitoring/oodmonitor/group"/>
+ </component>
+ <component id="oommonitor" filter="s60" name="OOM Monitor" introduced="7.0s">
+ <unit bldFile="sysresmonitoring/oommonitor/group"/>
+ </component>
</collection>
<collection id="systemsettings" name="System Settings" level="system">
<component id="gssensorplugin" filter="s60" name="GS Sensor Plugin" class="plugin">
@@ -213,8 +191,6 @@
</component>
<component id="appsupport_pub" filter="s60" name="Generic Application Support Public Interfaces" class="api">
<unit bldFile="appsupport_pub/group"/>
- <!-- <unit bldFile="appsupport_pub/flash_viewer_framework_api/tsrc/bc/flashviewerframework/group"/> -->
- <!-- <unit bldFile="appsupport_pub/network_status_api/tsrc/bc/networkstatus/group"/> -->
</component>
<component id="appsupport_metadata" name="Generic Application Support Metadata" class="config" introduced="^2" purpose="development" target="desktop">
<unit mrp="appsupport_info/appsupport_metadata/appsupport_metadata.mrp"/>
--- a/symbian3/mw/btservices/package_definition_3.0.xml Wed Feb 03 19:36:09 2010 +0000
+++ b/symbian3/mw/btservices/package_definition_3.0.xml Wed Feb 03 20:06:22 2010 +0000
@@ -7,8 +7,6 @@
</component>
<component id="btnotif" filter="s60" name="Bluetooth Notifier">
<unit bldFile="bluetoothengine/btnotif/group"/>
- <!-- is this test needed as unit? -->
- <!-- <unit bldFile="bluetoothengine/btnotif/tsrc/btnotifapitest/group"/> -->
</component>
<component id="btaudioman" filter="s60" name="Bluetooth Audio Manager">
<unit bldFile="bluetoothengine/btaudioman/group"/>
@@ -21,13 +19,11 @@
</component>
<component id="btaudiostreamer" filter="s60" name="Bluetooth Audio Streamer">
<unit bldFile="bluetoothengine/btaudiostreamer/group"/>
- <!-- <unit bldFile="bluetoothengine/btaudiostreamer/tsrc/btaudiostreamerapitest/group"/> -->
</component>
<component id="btsap" filter="s60" name="Bluetooth SIM Access Profile" class="plugin">
<unit bldFile="bluetoothengine/btsap/group"/>
</component>
<component id="btui" filter="s60" name="Bluetooth UI">
- <!-- <unit bldFile="bluetoothengine/btui/ecom/group"/> -->
<unit bldFile="bluetoothengine/btui/group"/>
</component>
<component id="btpbap" filter="s60" name="Bluetooth Phonebook Access Profile" class="plugin">
@@ -36,6 +32,9 @@
<component id="bthid" filter="s60" name="Bluetooth HID">
<unit bldFile="bluetoothengine/bthid/group"/>
</component>
+ <component id="btctrldcmoadapter" filter="s60" name="Bluetooth Control DCMO Adapter" class="plugin" introduced="^3">
+ <unit bldFile="bluetoothengine/bthid/group"/>
+ </component>
</collection>
<collection id="bluetoothappprofiles" name="Bluetooth Application Profiles" level="plugin">
<component id="avrcp" name="Bluetooth AVRCP" introduced="9.1" purpose="optional">
@@ -43,9 +42,18 @@
</component>
</collection>
<collection id="btservices_info" name="BT Services Info" level="plugin">
+ <component id="btservices_plat" filter="s60" name="BT Services Platform Interfaces" class="api">
+ <unit bldFile="btservices_plat/group"/>
+ </component>
+ <component id="btservices_pub" filter="s60" name="BT Services Public Interfaces" class="api">
+ <unit bldFile="btservices_pub/group"/>
+ </component>
<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"/>
</component>
+ <component id="btservices_api_test" name="BT Services API Tests" purpose="development" filter="s60,api_test">
+ <unit bldFiile="tsrc/group"/>
+ </component>
</collection>
</package>
</SystemDefinition>
--- a/symbian3/mw/camerasrv/package_definition_3.0.xml Wed Feb 03 19:36:09 2010 +0000
+++ b/symbian3/mw/camerasrv/package_definition_3.0.xml Wed Feb 03 20:06:22 2010 +0000
@@ -2,7 +2,9 @@
<SystemDefinition schema="3.0.0">
<package id="camerasrv" name="Camera Services" levels="plugin fw api">
<collection id="camappengine" name="Camera App Engine" level="fw">
+ <!-- is this collection really a component? If so, move down a directory -->
<component id="stillconverter" filter="s60" name="Still Image Converter">
+ <!-- should separate this from parent engine's bld.inf -->
<!-- <unit bldFile="camappengine/stillconverter/group"/> -->
</component>
<component id="camappengine_engine" filter="s60" name="Camera App Engine">
@@ -11,46 +13,32 @@
</component>
<component id="asynchfilesavequeue" filter="s60" name="Asynch File Save Queue">
<unit bldFile="camappengine/asynchfilesavequeue/group"/>
- <!-- should next bld.inf be #included in previous? -->
- <!-- <unit bldFile="camappengine/asynchfilesavequeue/tsrc/public/basic/group"/> -->
</component>
<component id="camappengine_build" filter="s60" name="Camera App Engine Build">
<unit bldFile="camappengine/build"/>
</component>
</collection>
<collection id="camcordermmfplugin" name="Camcorder MMF Plugin" level="plugin">
- <component id="mediarecorder" filter="s60" name="Camcorder Media Recorder">
- <!-- <unit bldFile="camcordermmfplugin/mediarecorder/group"/> -->
- </component>
- <component id="filecomposer" filter="s60" name="File Composer">
- <!-- <unit bldFile="camcordermmfplugin/filecomposer/group"/> -->
- </component>
- <component id="camcordermmfplugin_controller" filter="s60" name="Camcorder Controller MMF Plugin" class="plugin">
- <!-- <unit bldFile="camcordermmfplugin/controller/group"/> -->
- </component>
- <component id="camcordermmfplugin_test" filter="s60" name="Camcorder MMF Plugin Test" purpose="development">
- <!-- <unit bldFile="camcordermmfplugin/tsrc/public/basic/group"/> -->
- </component>
- <component id="camcordermmfplugin_build" filter="s60" name="Camcorder MMF Plugin Build">
- <!-- should split this into individual bld.inf files for the above components, or collapse all into a single component? -->
+ <!-- collection is really a component. Should move down a directory -->
+ <component id="camcordermmfplugin_build" filter="s60" name="Camcorder MMF Plugin Build" class="plugin">
<unit bldFile="camcordermmfplugin/build"/>
</component>
</collection>
<collection id="configmanagers" name="Config Managers" level="api">
<component id="imagingconfigmanager" filter="s60" name="Imaging Config Manager">
<unit bldFile="configmanagers/imagingconfigmanager/group"/>
- <!-- should this test be #included in the above? -->
- <!-- <unit bldFile="configmanagers/imagingconfigmanager/tsrc/public/basic/group"/> -->
</component>
</collection>
<collection id="camerasrv_info" name="Camera Services Info" level="api">
<component id="camerasrv_plat" filter="s60" name="Camera Services Platform Interfaces" class="api">
<unit bldFile="camerasrv_plat/group"/>
- <!-- should below tests be #included? -->
- <!-- <unit bldFile="camerasrv_plat/asynchronous_file_saving_queue_api/tsrc/group"/> -->
- <!-- <unit bldFile="camerasrv_plat/camera_application_engine_api/tsrc/group"/> -->
- <!-- <unit bldFile="camerasrv_plat/imaging_configuration_manager_api/tsrc/group"/> -->
- <!-- <unit bldFile="camerasrv_plat/media_recorder_api/tsrc/group"/> -->
+ </component>
+ <component id="camerasrv_test" filter="s60,api_test" name="Camera Services API Test" purpose="development">
+ <!-- #include from a single bld.inf or split into mutliple componens -->
+ <unit bldFile="camerasrv_plat/asynchronous_file_saving_queue_api/tsrc/group"/>
+ <unit bldFile="camerasrv_plat/camera_application_engine_api/tsrc/group"/>
+ <unit bldFile="camerasrv_plat/imaging_configuration_manager_api/tsrc/group"/>
+ <unit bldFile="camerasrv_plat/media_recorder_api/tsrc/group"/>
</component>
<component id="camerasrv_build" filter="s60" name="Camera Services Build">
<!-- should split into individual bld.infs -->
--- a/symbian3/mw/classicui/package_definition_3.0.xml Wed Feb 03 19:36:09 2010 +0000
+++ b/symbian3/mw/classicui/package_definition_3.0.xml Wed Feb 03 20:06:22 2010 +0000
@@ -1,42 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<SystemDefinition schema="3.0.0">
<package id="classicui" name="Classic UI" levels="base support server generic specific">
- <collection id="psln" name="Personalization" level="specific">
- <component id="pslnengine" filter="s60" name="Personalization Engine">
- <!-- <unit bldFile="psln/pslnengine/group"/> -->
- </component>
- <component id="pslnframework" filter="s60" name="Personalization Framework">
- <!-- <unit bldFile="psln/pslnframework"/> -->
- </component>
- <component id="pslnlibraryloaders" filter="s60" name="Personalization Library Loaders">
- <!-- no bld.inf, need to create one or remove component -->
- </component>
- <component id="pslnslidesetdialog" filter="s60" name="Personalization Slideset Dialog" class="plugin">
- <!-- <unit bldFile="psln/pslnslidesetdialog/group"/> -->
- </component>
- <component id="pslngsplugin" filter="s60" name="Personalization GS Plugin" class="plugin">
- <unit bldFile="psln/pslngsplugin/group"/>
- </component>
- <component id="psln_help" filter="s60" name="Personalization Help">
- <unit bldFile="psln/help/group"/>
- </component>
- <component id="psln_build" filter="s60" name="Personalization Build">
- <!-- the Psln group bld.inf should be distributed into the individual components, or they should be collapsed in a single component -->
- <unit bldFile="psln/group"/>
- </component>
- </collection>
- <collection id="applicationinterworkingfw" name="Application Interworking Framework" level="generic">
- <component id="aifwservicehandler" filter="s60" name="Application Interworking Service Handle">
- <unit bldFile="applicationinterworkingfw/servicehandler/group"/>
- </component>
- </collection>
- <collection id="commonuis" name="Common UIs" level="specific">
- <component id="commonui" filter="s60" name="Common UI">
- <unit bldFile="commonuis/commonui/group"/>
- </component>
- <component id="commondialogs" filter="s60" name="Common Dialogs">
- <unit bldFile="commonuis/commondialogs/group"/>
- <!-- <unit bldFile="commonuis/commondialogs/group_test"/> -->
+ <collection id="ode" name="Open Dynamics Engine" level="support">
+ <!-- the collection is really a component. Move down a directory.-->
+ <component id="ode_build" filter="s60" name="ODE">
+ <unit bldFile="ode/group"/>
</component>
</collection>
<collection id="uifw" name="UI Framework" level="server">
@@ -47,13 +15,10 @@
<unit bldFile="uifw/eikctl/group"/>
</component>
<component id="avkon" filter="s60" name="Avkon">
+ <!-- can only have one unit. Split into 3 components, or #include all from same bld.inf -->
<unit bldFile="uifw/avkon/aknphysics/group"/>
<unit bldFile="uifw/avkon/group"/>
- <unit bldFile="uifw/avkon/odeconf/group"/>
- <!-- <unit bldFile="uifw/avkon/aknhlist/group"/> -->
- <!-- <unit bldFile="uifw/avkon/aknkeyrotator/group"/> -->
- <!-- <unit bldFile="uifw/avkon/prebuilder"/> -->
- <!-- <unit bldFile="uifw/avkon/tsrc/bc/s60_sdkmcl/bctestmixmcl/group"/> -->
+ <unit bldFile="uifw/avkon/aknconf/group"/>
</component>
<component id="eikstd" filter="s60" name="Eikon Standard">
<unit bldFile="uifw/eikstd/group"/>
@@ -64,18 +29,50 @@
<component id="ganes" filter="s60" name="Ganes">
<unit bldFile="uifw/ganes/group"/>
</component>
- <component id="uifw_test" filter="s60" name="UI Framework Test" purpose="development">
- <!-- <unit bldFile="uifw/tsrc/group"/> -->
+ </collection>
+ <collection id="commonuis" name="Common UIs" level="specific">
+ <component id="commonui" filter="s60" name="Common UI">
+ <unit bldFile="commonuis/commonui/group"/>
+ </component>
+ <component id="commondialogs" filter="s60" name="Common Dialogs">
+ <unit bldFile="commonuis/commondialogs/group"/>
+ </component>
+ </collection>
+ <collection id="applicationinterworkingfw" name="Application Interworking Framework" level="generic">
+ <component id="aifwservicehandler" filter="s60" name="Application Interworking Service Handler">
+ <unit bldFile="applicationinterworkingfw/servicehandler/group"/>
+ </component>
+ </collection>
+ <collection id="psln" name="Personalization" level="specific">
+ <!-- the collection is really a component. Move down a directory. Or it could be split into multiple components-->
+ <component id="psln_build" filter="s60" name="Personalization Build">
+ <unit bldFile="psln/group"/>
</component>
</collection>
<collection id="commonadapter" name="Common Adapter" level="support">
+ <!-- the collection is really a component. Move down a directory.-->
<component id="commonadapter_build" filter="s60" name="Common Adapter Build">
<unit bldFile="commonadapter/group"/>
</component>
</collection>
- <collection id="ode" name="Open Dynamics Engine" level="support">
- <component id="ode_build" filter="s60" name="ODE">
- <unit bldFile="ode/group"/>
+ <collection id="akntouchgesturefw" name="Avkon Touch Gesture Framework" level="generic">
+ <!-- the collection is really a component. Move down a directory.-->
+ <component id="akntouchgesturefw_build" filter="s60" name="Avkon Touch Gesture Framework Build" introduced="^3">
+ <unit bldFile="akntouchgesturefw/group"/>
+ </component>
+ </collection>
+ <collection id="uiutils" name="UI Utils" level="specific">
+ <component id="localizer" filter="s60" name="Directory Localizer">
+ <unit bldFile="uiutils/localizer/group"/>
+ </component>
+ <component id="findutil" filter="s60" name="Find Utility">
+ <unit bldFile="uiutils/findutil/group"/>
+ </component>
+ <component id="gamerecognizer" filter="s60" name="Game Recognizer" class="plugin">
+ <unit bldFile="uiutils/gamerecognizer/group"/>
+ </component>
+ <component id="aknjapanesereading" filter="s60" name="Avkon Japanese Reading">
+ <unit bldFile="uiutils/aknjapanesereading/group"/>
</component>
</collection>
<collection id="commonuisupport" name="Common UI Support" level="support">
@@ -116,29 +113,133 @@
</component>
</collection>
<collection id="classicui_info" name="Classic UI Info" level="specific">
- <!-- the multiple units in the API components need to be resolved -->
<component id="classicui_pub" filter="s60" name="Classic UI Public Interfaces" class="api">
<unit bldFile="classicui_pub/group"/>
</component>
<component id="classicui_plat" filter="s60" name="Classic UI Platform Interfaces" class="api">
<unit bldFile="classicui_plat/group"/>
</component>
- <component id="classicui_test" filter="s60" name="Classic UI Tests" purpose="development">
- <unit bldFile="classicui_plat/tsrc/group"/>
- <unit bldFile="classicui_pub/document_handler_api/tsrc/group"/>
- <unit bldFile="classicui_pub/server_application_api/tsrc/group"/>
- <!-- <unit bldFile="classicui_pub/tsrc/bc/apps/bctesttemplate/group"/> -->
- <!-- <unit bldFile="classicui_pub/tsrc/bc/apps/s60_sdk3.0/group"/> -->
- <!-- <unit bldFile="classicui_pub/tsrc/bc/apps/s60_sdk3.1/group"/> -->
- <!-- <unit bldFile="classicui_pub/tsrc/bc/apps/s60_sdk3.2/group"/> -->
- <!-- <unit bldFile="classicui_pub/tsrc/bc/apps/s60_sdk5.0/bctestpane/group"/> -->
- <!-- <unit bldFile="classicui_pub/tsrc/bc/apps/s60_sdk5.0/group"/> -->
- <!-- <unit bldFile="classicui_pub/tsrc/bc/group"/> -->
- <!-- <unit bldFile="classicui_plat/avkon_testability_api/tsrc/group"/> -->
- <!-- <unit bldFile="classicui_plat/extended_sounds_api/tsrc/group"/> -->
- <unit bldFile="classicui_plat/ganes_api/tsrc/group"/>
- <unit bldFile="classicui_plat/physics_api/tsrc/group"/>
- </component>
+ <!-- the multiple units in the API test components need to be resolved -->
+ <component id="classicui_plat_api_test" filter="s60,api_test" name="Classic UI Platform API Tests" purpose="development">
+ <!-- can only have one unit. Need to #include from a single bld.inf -->
+ <unit bldFile="tsrc/group" name="classicui_tsrc_all"/>
+ <unit bldFile="classicui_plat/aiw_provider_utility_api/tsrc/group"/>
+ <unit bldFile="classicui_plat/aiw_service_interface_base_api/tsrc/group"/>
+ <unit bldFile="classicui_plat/aiw_service_interface_menu_api/tsrc/group"/>
+ <unit bldFile="classicui_plat/alarm_api/tsrc/group"/>
+ <unit bldFile="classicui_plat/application_switching_api/tsrc/group"/>
+ <unit bldFile="classicui_plat/avkon_fonts_api/tsrc/group"/>
+ <unit bldFile="classicui_plat/avkon_secondary_display_support_api/tsrc/group"/>
+ <unit bldFile="classicui_plat/avkon_ui_server_api/tsrc/group"/>
+ <unit bldFile="classicui_plat/battery_pane_api/tsrc/group"/>
+ <unit bldFile="classicui_plat/common_file_dialogs_filter_factory_api/tsrc/group"/>
+ <unit bldFile="classicui_plat/custom_cursors_api/tsrc/group"/>
+ <unit bldFile="classicui_plat/eikon_server_extension_client_api/tsrc/group"/>
+ <unit bldFile="classicui_plat/emergency_call_support_api/tsrc/group"/>
+ <unit bldFile="classicui_plat/extended_aiw_criteria_api/tsrc/group"/>
+ <unit bldFile="classicui_plat/extended_animation_api/tsrc/group"/>
+ <unit bldFile="classicui_plat/extended_buttons_api/tsrc/group"/>
+ <unit bldFile="classicui_plat/extended_editors_api/tsrc/group"/>
+ <unit bldFile="classicui_plat/extended_grids_api/tsrc/group"/>
+ <unit bldFile="classicui_plat/extended_indicators_api/tsrc/group"/>
+ <unit bldFile="classicui_plat/extended_initialization_api/tsrc/group"/>
+ <unit bldFile="classicui_plat/extended_input_capabilities_api/tsrc/group"/>
+ <unit bldFile="classicui_plat/extended_lists_api/tsrc/group"/>
+ <unit bldFile="classicui_plat/extended_notes_api/tsrc/group"/>
+ <unit bldFile="classicui_plat/extended_notifiers_api/tsrc/group"/>
+ <unit bldFile="classicui_plat/extended_options_menu_api/tsrc/group"/>
+ <unit bldFile="classicui_plat/extended_setting_pages_api/tsrc/group"/>
+ <unit bldFile="classicui_plat/extended_status_pane_api/tsrc/group"/>
+ <unit bldFile="classicui_plat/extended_utilities_api/tsrc/group"/>
+ <unit bldFile="classicui_plat/find_item_ui_api/tsrc/group"/>
+ <unit bldFile="classicui_plat/generic_parameter_api/tsrc/group"/>
+ <unit bldFile="classicui_plat/global_popup_priority_controller_api/tsrc/group"/>
+ <unit bldFile="classicui_plat/indicator_plugin_api/tsrc/group"/>
+ <unit bldFile="classicui_plat/input_block_api/tsrc/group"/>
+ <unit bldFile="classicui_plat/item_finder_api/tsrc/group"/>
+ <unit bldFile="classicui_plat/japanese_reading_api/tsrc/group"/>
+ <unit bldFile="classicui_plat/key_rotator_api/tsrc/group"/>
+ <unit bldFile="classicui_plat/layout_configuration_api/tsrc/group"/>
+ <unit bldFile="classicui_plat/list_effects_api/tsrc/group"/>
+ <unit bldFile="classicui_plat/long_tap_animation_api/tsrc/group"/>
+ <unit bldFile="classicui_plat/media_shared_document_api/tsrc/group"/>
+ <unit bldFile="classicui_plat/memory_card_ui_api/tsrc/group"/>
+ <unit bldFile="classicui_plat/number_grouping_api/tsrc/group"/>
+ <!--unit bldFile="classicui_plat/personalisation_framework_api/tsrc/group" /-->
+ <unit bldFile="classicui_plat/phone_number_text_utilities_api/tsrc/group"/>
+ <unit bldFile="classicui_plat/pointer_event_modifier_api/tsrc/group"/>
+ <unit bldFile="classicui_plat/popup_form_api/tsrc/group"/>
+ <unit bldFile="classicui_plat/server_application_services_api/tsrc/group"/>
+ <unit bldFile="classicui_plat/signal_pane_api/tsrc/group"/>
+ <unit bldFile="classicui_plat/skinnable_clock_api/tsrc/group"/>
+ <unit bldFile="classicui_plat/special_character_table_api/tsrc/group"/>
+ <unit bldFile="classicui_plat/stylus_activated_popup_api/tsrc/group"/>
+ <unit bldFile="classicui_plat/task_list_api/tsrc/group"/>
+ <unit bldFile="classicui_plat/text_scroller_api/tsrc/group"/>
+ <unit bldFile="classicui_plat/touch_gesture_framework_api/tsrc/group"/>
+ <unit bldFile="classicui_plat/touch_pane_api/tsrc/group"/>
+ <unit bldFile="classicui_plat/transition_effect_parameters_api/tsrc/group"/>
+ <unit bldFile="classicui_plat/transition_effect_utilities_api/tsrc/group"/>
+ <unit bldFile="classicui_plat/volume_popup_api/tsrc/group"/>
+ </component>
+ <component id="classicui_pub_api_test" filter="s60,api_test" name="Classic UI Public API Tests" purpose="development">
+ <!-- can only have one unit. Need to #include from a single bld.inf -->
+ <unit bldFile="classicui_pub/aiw_criteria_api/tsrc/group"/>
+ <unit bldFile="classicui_pub/aiw_generic_parameter_api/tsrc/group"/>
+ <unit bldFile="classicui_pub/aiw_service_handler_api/tsrc/group"/>
+ <unit bldFile="classicui_pub/animation_api/tsrc/group"/>
+ <unit bldFile="classicui_pub/application_framework_api/tsrc/group"/>
+ <unit bldFile="classicui_pub/base_controls_api/tsrc/group"/>
+ <unit bldFile="classicui_pub/buttons_api/tsrc/group"/>
+ <unit bldFile="classicui_pub/choice_list_api/tsrc/group"/>
+ <unit bldFile="classicui_pub/common_file_dialogs_api/tsrc/group"/>
+ <unit bldFile="classicui_pub/context_pane_api/tsrc/group"/>
+ <unit bldFile="classicui_pub/dialog_shutter_api/tsrc/group"/>
+ <unit bldFile="classicui_pub/dialogs_api/tsrc/group"/>
+ <unit bldFile="classicui_pub/editors_api/tsrc/group"/>
+ <unit bldFile="classicui_pub/error_ui_api/tsrc/group"/>
+ <unit bldFile="classicui_pub/fonts_api/tsrc/group"/>
+ <unit bldFile="classicui_pub/form_api/tsrc/group"/>
+ <unit bldFile="classicui_pub/generic_button_api/tsrc/group"/>
+ <unit bldFile="classicui_pub/grids_api/tsrc/group"/>
+ <unit bldFile="classicui_pub/hierarchical_lists_api/tsrc/group"/>
+ <unit bldFile="classicui_pub/hotkeys_api/tsrc/group"/>
+ <unit bldFile="classicui_pub/images_api/tsrc/group"/>
+ <unit bldFile="classicui_pub/indicators_api/tsrc/group"/>
+ <unit bldFile="classicui_pub/info_popup_note_api/tsrc/group"/>
+ <unit bldFile="classicui_pub/information_preview_popup_api/tsrc/group"/>
+ <unit bldFile="classicui_pub/initialization_api/tsrc/group"/>
+ <unit bldFile="classicui_pub/input_frame_api/tsrc/group"/>
+ <unit bldFile="classicui_pub/keylock_api/tsrc/group"/>
+ <unit bldFile="classicui_pub/labels_api/tsrc/group"/>
+ <unit bldFile="classicui_pub/lists_api/tsrc/group"/>
+ <unit bldFile="classicui_pub/misc_controls_api/tsrc/group"/>
+ <unit bldFile="classicui_pub/navigation_pane_api/tsrc/group"/>
+ <unit bldFile="classicui_pub/notes_api/tsrc/group"/>
+ <unit bldFile="classicui_pub/notifiers_api/tsrc/group"/>
+ <unit bldFile="classicui_pub/options_menu_api/tsrc/group"/>
+ <unit bldFile="classicui_pub/popups_api/tsrc/group"/>
+ <unit bldFile="classicui_pub/private_ui_framework_api/tsrc/group"/>
+ <unit bldFile="classicui_pub/queries_api/tsrc/group"/>
+ <unit bldFile="classicui_pub/screen_clearer_api/tsrc/group"/>
+ <unit bldFile="classicui_pub/screen_mode_api/tsrc/group"/>
+ <unit bldFile="classicui_pub/screen_saver_api/tsrc/group"/>
+ <unit bldFile="classicui_pub/scroller_api/tsrc/group"/>
+ <unit bldFile="classicui_pub/searchfield_api/tsrc/group"/>
+ <unit bldFile="classicui_pub/setting_pages_api/tsrc/group"/>
+ <unit bldFile="classicui_pub/slider_api/tsrc/group"/>
+ <unit bldFile="classicui_pub/sounds_api/tsrc/group"/>
+ <unit bldFile="classicui_pub/status_pane_api/tsrc/group"/>
+ <unit bldFile="classicui_pub/stylus_popup_menu_api/tsrc/group"/>
+ <unit bldFile="classicui_pub/tabs_api/tsrc/group"/>
+ <unit bldFile="classicui_pub/title_pane_api/tsrc/group"/>
+ <unit bldFile="classicui_pub/toolbar_api/tsrc/group"/>
+ <unit bldFile="classicui_pub/touch_ui_utilities_api/tsrc/group"/>
+ <unit bldFile="classicui_pub/ui_framework_definitions_api/tsrc/group"/>
+ <unit bldFile="classicui_pub/ui_framework_utilities_api/tsrc/group"/>
+ <unit bldFile="classicui_pub/volume_control_api/tsrc/group"/>
+ <unit bldFile="classicui_pub/window_server_event_observer_api/tsrc/group"/>
+ </component>
<component id="classicui_metadata" name="Classic UI Metadata" class="config" introduced="^2" purpose="development" target="desktop">
<unit mrp="classicui_info/classicui_metadata/classicui_metadata.mrp"/>
</component>
--- a/symbian3/mw/dlnasrv/package_definition_3.0.xml Wed Feb 03 19:36:09 2010 +0000
+++ b/symbian3/mw/dlnasrv/package_definition_3.0.xml Wed Feb 03 20:06:22 2010 +0000
@@ -6,6 +6,7 @@
<unit bldFile="upnpavcontrolpoint/avcontrolframework/group"/>
</component>
<component id="upnpavcontrolpoint_build" filter="s60" name="UPnP A/V Control Point Build" introduced="9.1" deprecated="^3">
+ <!-- put exports in other component instead -->
<unit bldFile="upnpavcontrolpoint/group"/>
</component>
</collection>
@@ -26,41 +27,101 @@
<unit bldFile="upnpmediaserver/mediaserverengine/group"/>
</component>
<component id="upnpmediaserver_build" filter="s60" name="UPnP Media Server Build">
- <!-- consider moving content into above components -->
+ <!-- move exports into one of above components -->
<unit bldFile="upnpmediaserver/group"/>
</component>
</collection>
- <collection id="upnpstack" name="UPnP Stack" level="stack">
- <component id="upnputils" filter="s60" name="UPnP Utils">
- <unit bldFile="upnpstack/upnputils/group"/>
+ <collection id="upnpavcontroller" name="UPnP A/V Controller" level="ctrl">
+ <component id="upnpxmlparser" filter="s60" name="UPnP XML Parser" introduced="^2">
+ <unit bldFile="upnpavcontroller/upnpxmlparser/group"/>
+ </component>
+ <component id="upnpavcontrollerserver" filter="s60" name="UPnP A/V Controller Server" introduced="^2">
+ <unit bldFile="upnpavcontroller/upnpavcontrollerserver/group"/>
+ </component>
+ <component id="upnpavcontrollerclient" filter="s60" name="UPnP A/V Ccontroller Client" introduced="^2">
+ <unit bldFile="upnpavcontroller/upnpavcontrollerclient/group"/>
</component>
- <component id="upnpconnectionmanagersession" filter="s60" name="UPnP Connection Manager Session">
- <unit bldFile="upnpstack/upnpconnectionmanagersession/group"/>
+ <component id="upnpavcontrollerhelper" filter="s60" name="UPnP A/V Controller Helper" introduced="^2">
+ <unit bldFile="upnpavcontroller/upnpavcontrollerhelper/group"/>
+ </component>
+ <component id="upnpavcontroller_build" filter="s60" name="UPnP A/V Controller Build" introduced="^2">
+ <!-- move exports content into one of above components -->
+ <unit bldFile="upnpavcontroller/group"/>
+ </component>
+ </collection>
+ <collection id="upnpframework" name="UPnP Framework" level="framework">
+ <component id="upnputilities" filter="s60" name="UPnP Utilities" introduced="^2">
+ <unit bldFile="upnpframework/upnputilities/group"/>
</component>
- <component id="upnpconnmanager" filter="s60" name="UPnP Connection Manager">
- <unit bldFile="upnpstack/upnpconnmanager/group"/>
+ <component id="upnpextensionpluginif" filter="s60" name="UPnP Home Media Extension Plugin Interface" introduced="^2" deprecated="^3">
+ <meta rel="config">
+ <defined condition="FF_UPNP_FRAMEWORK_2_0"/>
+ </meta>
+ <unit bldFile="upnpframework/upnpextensionpluginif/group"/>
+ </component>
+ <component id="upnpfiletransferengine" filter="s60" name="UPnP File Transfer Engine" introduced="^2" deprecated="^3">
+ <meta rel="config">
+ <defined condition="FF_UPNP_FRAMEWORK_2_0"/>
+ </meta>
+ <unit bldFile="upnpframework/upnpfiletransferengine/group"/>
</component>
- <component id="dlnawebserver" filter="s60" name="DLNA Web Server">
- <unit bldFile="upnpstack/dlnawebserver/group"/>
+ <component id="upnpcommonui" filter="s60" name="UPnP Common UI" introduced="^2" deprecated="^3">
+ <meta rel="config">
+ <defined condition="FF_UPNP_FRAMEWORK_2_0"/>
+ </meta>
+ <unit bldFile="upnpframework/upnpcommonui/group"/>
</component>
- <component id="serviceframework" filter="s60" name="Service Framework">
- <unit bldFile="upnpstack/serviceframework/group"/>
+ <component id="upnpaiwengine" filter="s60" name="UPnP AIW Engine" introduced="^2" deprecated="^3">
+ <meta rel="config">
+ <defined condition="FF_UPNP_FRAMEWORK_2_0"/>
+ </meta>
+ <unit bldFile="upnpframework/upnpaiwengine/group"/>
</component>
- <component id="ssdpserver" filter="s60" name="SSDP Server">
- <unit bldFile="upnpstack/ssdpserver/group"/>
+ <component id="upnpaiwprovider" filter="s60" name="UPnP AIW Provider" class="plugin" introduced="^2" deprecated="^3">
+ <meta rel="config">
+ <defined condition="FF_UPNP_FRAMEWORK_2_0"/>
+ </meta>
+ <unit bldFile="upnpframework/upnpaiwprovider/group"/>
+ </component>
+ <component id="upnpmusicadapter" filter="s60" name="UPnP Music Adapter" introduced="^2">
+ <unit bldFile="upnpframework/upnpmusicadapter/group"/>
</component>
- <component id="messagehandler" filter="s60" name="Message Handler">
- <unit bldFile="upnpstack/messagehandler/group"/>
+ <component id="upnpcommand" filter="s60" name="UPnP Command" introduced="^2">
+ <unit bldFile="upnpframework/upnpcommand/group"/>
+ </component>
+ <component id="upnpframework_build" filter="s60" name="UPnP Framework Build" introduced="^2">
+ <!-- move exports content into one of above components -->
+ <unit bldFile="upnpframework/group"/>
+ </component>
+ </collection>
+ <collection id="upnpsettings" name="UPnP Settings" level="framework">
+ <component id="upnpsettingsengine" filter="s60" name="UPnP Settings Engine" introduced="^2">
+ <unit bldFile="upnpsettings/upnpsettingsengine/group"/>
</component>
- <component id="controlpointbase" filter="s60" name="Control Point Base">
- <unit bldFile="upnpstack/controlpointbase/group"/>
+ <component id="multiselectionui" filter="s60" name="Multi-Selection UI" introduced="^2" deprecated="^3">
+ <meta rel="config">
+ <defined condition="FF_UPNP_FRAMEWORK_2_0"/>
+ </meta>
+ <unit bldFile="upnpsettings/multiselectionui/group"/>
+ </component>
+ <component id="appwizard" filter="s60" name="UPnP Settings Wizard App" introduced="^2" deprecated="^3">
+ <meta rel="config">
+ <defined condition="FF_UPNP_FRAMEWORK_2_0"/>
+ </meta>
+ <unit bldFile="upnpsettings/appwizard/group"/>
</component>
- <component id="upnphttptransfer" filter="s60" name="UPnP HTTP Transfer">
- <unit bldFile="upnpstack/upnphttptransfer/group"/>
+ <component id="upnpsharingui" filter="s60" name="UPnP Sharing UI" introduced="^2" deprecated="^3">
+ <meta rel="config">
+ <defined condition="FF_UPNP_FRAMEWORK_2_0"/>
+ </meta>
+ <unit bldFile="upnpsettings/upnpsharingui/group"/>
</component>
- <component id="upnpstack_build" filter="s60" name="UPnP Stack Build">
- <!-- consider moving content into above components -->
- <unit bldFile="upnpstack/group"/>
+ <component id="upnpgsplugin" filter="s60" name="UPnP GS Plugin" class="plugin" introduced="^2">
+ <unit bldFile="upnpsettings/upnpgsplugin/group"/>
+ </component>
+ <component id="upnpsettings_build" filter="s60" name="UPnP Settings Build" introduced="^2">
+ <!-- move exports content into one of above components -->
+ <unit bldFile="upnpsettings/group"/>
</component>
</collection>
<collection id="upnpsharing" name="UPnP Sharing" level="server">
@@ -77,41 +138,23 @@
<unit bldFile="upnpsharing/applicationengine/group"/>
</component>
<component id="upnpsharing_build" filter="s60" name="UPnP Sharing Build" introduced="^2">
- <!-- consider moving content into above components -->
+ <!-- move exports content into one of above components -->
<unit bldFile="upnpsharing/group"/>
</component>
</collection>
- <collection id="upnpsettings" name="UPnP Settings" level="framework">
- <component id="upnpsettingsengine" filter="s60" name="UPnP Settings Engine" introduced="^2">
- <unit bldFile="upnpsettings/upnpsettingsengine/group"/>
- </component>
- <component id="multiselectionui" filter="s60" name="Multi-Selection UI" introduced="^2" deprecated="^3">
- <unit bldFile="upnpsettings/multiselectionui/group"/>
- </component>
- <component id="appwizard" filter="s60" name="UPnP Settings Wizard App" introduced="^2" deprecated="^3">
- <unit bldFile="upnpsettings/appwizard/group"/>
- </component>
- <component id="upnpsharingui" filter="s60" name="UPnP Sharing UI" introduced="^2" deprecated="^3">
- <unit bldFile="upnpsettings/upnpsharingui/group"/>
- </component>
- <component id="upnpgsplugin" filter="s60" name="UPnP GS Plugin" class="plugin" introduced="^2">
- <unit bldFile="upnpsettings/upnpgsplugin/group"/>
- </component>
- <component id="upnpsettings_build" filter="s60" name="UPnP Settings Build" introduced="^2">
- <!-- consider moving content into above components -->
- <unit bldFile="upnpsettings/group"/>
- </component>
- </collection>
<collection id="upnpmpxplugins" name="UPnP MPX Plugins" level="plugin">
<component id="upnpplaybackplugins" filter="s60" name="UPnP Playback Plugins" class="plugin" introduced="^2">
<unit bldFile="upnpmpxplugins/upnpplaybackplugins/group"/>
</component>
<component id="upnpmpxplugins_build" filter="s60" name="UPnP MPX Plugins Build" introduced="^2">
- <!-- consider moving content into above components -->
+ <!-- move exports content into other component? -->
<unit bldFile="upnpmpxplugins/group"/>
</component>
</collection>
<collection id="upnpharvester" name="UPnP Harvester" level="ctrl">
+ <meta rel="config">
+ <defined condition="FF_UPNP_FRAMEWORK_2_0"/>
+ </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"/>
@@ -126,77 +169,23 @@
<unit bldFile="upnpharvester/mdhserver/group"/>
</component>
<component id="upnpharvester_build" filter="s60" name="UPnP Harvester Build" introduced="^2" deprecated="^3">
- <!-- consider moving content into above components -->
+ <!-- could just make the whole collection one component and move down a dir. Or move the exports here into the other component -->
<unit bldFile="upnpharvester/group"/>
</component>
</collection>
- <collection id="upnpframework" name="UPnP Framework" level="framework">
- <component id="upnputilities" filter="s60" name="UPnP Utilities" introduced="^2">
- <unit bldFile="upnpframework/upnputilities/group"/>
- </component>
- <component id="upnpextensionpluginif" filter="s60" name="UPnP Extension Plugin Interface" introduced="^2" deprecated="^3">
- <unit bldFile="upnpframework/upnpextensionpluginif/group"/>
- </component>
- <component id="upnpfiletransferengine" filter="s60" name="UPnP File Transfer Engine" introduced="^2" deprecated="^3">
- <unit bldFile="upnpframework/upnpfiletransferengine/group"/>
- </component>
- <component id="upnpmusicadapter" filter="s60" name="UPnP Music Adapter" introduced="^2">
- <unit bldFile="upnpframework/upnpmusicadapter/group"/>
- </component>
- <component id="upnpcommonui" filter="s60" name="UPnP Common UI" introduced="^2" deprecated="^3">
- <unit bldFile="upnpframework/upnpcommonui/group"/>
- </component>
- <component id="upnpcommand" filter="s60" name="UPnP Command" introduced="^2">
- <unit bldFile="upnpframework/upnpcommand/group"/>
- </component>
- <component id="upnpaiwengine" filter="s60" name="UPnP AIW Engine" introduced="^2" deprecated="^3">
- <unit bldFile="upnpframework/upnpaiwengine/group"/>
- </component>
- <component id="upnpaiwprovider" filter="s60" name="UPnP AIW Provider" class="plugin" introduced="^2" deprecated="^3">
- <unit bldFile="upnpframework/upnpaiwprovider/group"/>
- </component>
- <component id="upnpframework_build" filter="s60" name="UPnP Framework Build" introduced="^2">
- <!-- consider moving content into above components -->
- <unit bldFile="upnpframework/group"/>
- </component>
- </collection>
- <collection id="upnpavcontroller" name="UPnP A/V Controller" level="ctrl">
- <component id="upnpxmlparser" filter="s60" name="UPnP XML Parser" introduced="^2">
- <unit bldFile="upnpavcontroller/upnpxmlparser/group"/>
- </component>
- <component id="upnpavcontrollerserver" filter="s60" name="UPnP A/V Controller Server" introduced="^2">
- <unit bldFile="upnpavcontroller/upnpavcontrollerserver/group"/>
- </component>
- <component id="upnpavcontrollerclient" filter="s60" name="UPnP A/V Ccontroller Client" introduced="^2">
- <unit bldFile="upnpavcontroller/upnpavcontrollerclient/group"/>
- </component>
- <component id="upnpavcontrollerhelper" filter="s60" name="UPnP A/V Controller Helper" introduced="^2">
- <unit bldFile="upnpavcontroller/upnpavcontrollerhelper/group"/>
- </component>
- <component id="upnpavcontroller_build" filter="s60" name="UPnP A/V Controller Build" introduced="^2">
- <!-- consider moving content into above components -->
- <unit bldFile="upnpavcontroller/group"/>
- </component>
- </collection>
<collection id="homesync" name="Home Sync" level="plugin">
+ <meta rel="config">
+ <defined condition="FF_UPNP_FRAMEWORK_2_0"/>
+ </meta>
<component id="contentmanager" filter="s60" name="Content Manager" introduced="^2" deprecated="^3">
- <!-- need to merge or #include these to a single bld.inf or split into individual componens -->
- <unit bldFile="homesync/contentmanager/cmserver/cmfillmanager/group"/>
- <unit bldFile="homesync/contentmanager/cmserver/cmmemorymanager/group"/>
- <unit bldFile="homesync/contentmanager/cmserver/cmscheduler/group"/>
- <unit bldFile="homesync/contentmanager/cmserver/cmserver/group"/>
- <unit bldFile="homesync/contentmanager/cmserver/cmstoremanager/group"/>
- <unit bldFile="homesync/contentmanager/homesyncgsplugin/group"/>
- <unit bldFile="homesync/contentmanager/homesyncwizard/group"/>
- <unit bldFile="homesync/contentmanager/mediaservant/applicationengine/group"/>
- <unit bldFile="homesync/contentmanager/mediaservant/group"/>
- </component>
- <component id="homesync_build" filter="s60" name="Home Sync Build" introduced="^2" deprecated="^3">
- <!-- consider moving content into above components -->
- <unit bldFile="homesync/group"/>
+ <unit bldFile="homesync/group"/> <!-- move bld.inf into contentmanager dir -->
</component>
</collection>
<collection id="homemedia" name="Home Media" level="framework">
+ <meta rel="config">
+ <defined condition="FF_UPNP_FRAMEWORK_2_0"/>
+ </meta>
+ <!-- collection is really just a component. Move down a directory -->
<component id="homemedia_build" filter="s60" name="Home Media" introduced="^2" deprecated="^3">
<unit bldFile="homemedia/group"/>
</component>
@@ -206,8 +195,12 @@
<unit bldFile="dlnasrv_plat/group"/>
</component>
<component id="dlnasrv_build" filter="s60" name="DLNA Services Build">
+ <!-- need to #include upnpplatformvar.hrh from each #included bld.inf, then this can be removed -->
<unit bldFile="group"/>
</component>
+ <component id="dlnasrv_api_test" filter="s60,api_test" name="DLNA Services API Tests" purpose="development">
+ <unit bldFile="tsrc/group"/>
+ </component>
</collection>
</package>
</SystemDefinition>
--- a/symbian3/mw/drm/package_definition_3.0.xml Wed Feb 03 19:36:09 2010 +0000
+++ b/symbian3/mw/drm/package_definition_3.0.xml Wed Feb 03 20:06:22 2010 +0000
@@ -2,6 +2,7 @@
<SystemDefinition schema="3.0.0">
<package id="drm" name="DRM" levels="plugin framework server generic specific">
<collection id="commondrm" name="Common DRM" level="generic">
+ <!-- it looks like this collection would be better as a component. If so, move down a directory. Otherwise, split up the bld.inf -->
<component id="drmencryptor" filter="s60" name="DRM Encryptor">
<!-- this should have its own bld.inf or be removed as a component -->
</component>
@@ -12,6 +13,9 @@
<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>
<unit bldFile="commondrm/drmutility/group"/>
</component>
<component id="drmserviceapiwrapper" filter="s60" name="DRM Service API Wrapper">
@@ -26,77 +30,26 @@
</component>
</collection>
<collection id="omadrm" name="OMA DRM" level="server">
- <component id="drmroapwbxmlparser" filter="s60" name="DRM ROAP WBXML Parser">
- <!-- <unit bldFile="omadrm/drmroapwbxmlparser/group"/> -->
- </component>
- <component id="drmplugins" filter="s60" name="DRM Plugins" class="plugin">
- <!-- should have a single bld.inf -->
- <!-- <unit bldFile="omadrm/drmplugins/drmfilter/group"/> -->
- <!-- <unit bldFile="omadrm/drmplugins/drmrecognizer/group"/> -->
- <!-- <unit bldFile="omadrm/drmplugins/drmrohandler/group"/> -->
- <!-- <unit bldFile="omadrm/drmplugins/drmromtm/group"/> -->
- </component>
- <component id="drmengine" filter="s60" name="DRM Engine">
- <!-- this should have its own bld.inf or be removed as a component -->
- </component>
- <component id="drmhelper" filter="s60" name="DRM Helper">
- <!-- <unit bldFile="omadrm/drmhelper/group"/> -->
- <!-- should drmhelperserver be #included in the above? -->
- <!-- <unit bldFile="omadrm/drmhelper/drmhelperserver/group"/> -->
- </component>
- <component id="drmlicensemanager" filter="s60" name="DRM License Manager">
- <!-- <unit bldFile="omadrm/drmlicensemanager/group"/> -->
- </component>
+ <!-- collection is really a component. Move down a directory -->
<component id="omadrm_build" filter="s60" name="OMA DRM Build">
- <!-- should be split into the above files, or them collapsed into a single component -->
<unit bldFile="omadrm/group"/>
</component>
</collection>
<collection id="wmdrm" name="Windows Media DRM" level="framework">
- <component id="wmdrmengine" filter="s60" name="WM DRM Engine">
- <!-- should have a single bld.inf -->
- <!-- <unit bldFile="wmdrm/wmdrmengine/wmdrmagent/group"/> -->
- <!-- <unit bldFile="wmdrm/wmdrmengine/wmdrmfileserver/client/group"/> -->
- <!-- <unit bldFile="wmdrm/wmdrmengine/wmdrmfileserver/server/group"/> -->
- <!-- <unit bldFile="wmdrm/wmdrmengine/wmdrmserver/client/group"/> -->
- <!-- <unit bldFile="wmdrm/wmdrmengine/wmdrmserver/clientwrapper/group"/> -->
- <!-- <unit bldFile="wmdrm/wmdrmengine/wmdrmserver/server/group"/> -->
- </component>
- <component id="camese" filter="s60" name="Camese">
- <!-- should have a single bld.inf -->
- <!-- <unit bldFile="wmdrm/camese/group"/> -->
- <!-- <unit bldFile="wmdrm/camese/cameseutility/group"/> -->
- <!-- <unit bldFile="wmdrm/camese/httpfiltercamese/group"/> -->
- <!-- <unit bldFile="wmdrm/camese/wmdrmdla/group"/> -->
- <!-- <unit bldFile="wmdrm/camese/wmdrmdlaapp/group"/> -->
- <!-- <unit bldFile="wmdrm/camese/wmdrmdladefaulthttpplugin/group"/> -->
- <!-- <unit bldFile="wmdrm/camese/wmdrmdladefaultuiplugin/group"/> -->
- <!-- <unit bldFile="wmdrm/camese/wmdrmdlautils/group"/> -->
- <!-- <unit bldFile="wmdrm/camese/wmdrmdlawrapper/group"/> -->
- </component>
+ <!-- collection is really a component. Move down a directory -->
<component id="wmdrm_build" filter="s60" name="WM DRM Build">
- <!-- should be split into the above files, or them collapsed into a single component -->
<unit bldFile="wmdrm/group"/>
</component>
</collection>
<collection id="drm_info" name="DRM Info" level="specific">
<component id="drm_pub" filter="s60" name="DRM Public Interfaces" class="api">
<unit bldFile="drm_pub/group"/>
- <!-- do the following need to be #included ? -->
- <!-- <unit bldFile="drm_pub/drm_helper_api/tsrc/group"/> -->
- <!-- <unit bldFile="drm_pub/drm_license_checker_api/tsrc/group"/> -->
- <!-- <unit bldFile="drm_pub/oma_drm_caf_agent_api/tsrc/bc/group"/> -->
</component>
<component id="drm_plat" filter="s60" name="DRM Platform Interfaces" class="api">
<unit bldFile="drm_plat/group"/>
- <!-- do the following need to be #included ? -->
- <!-- <unit bldFile="drm_plat/drm_common_api/tsrc/group"/> -->
- <!-- <unit bldFile="drm_plat/drm_rights_api/tsrc/group"/> -->
- <!-- <unit bldFile="drm_plat/roap_api/tsrc/group"/> -->
</component>
- <component id="drm_build" filter="s60" name="DRM Build">
- <!-- is this needed ? -->
- <unit bldFile="group"/>
+ <component id="drm_api_test" filter="s60,api_test" name="DRM Build" purpose="development">
+ <unit bldFile="tsrc/group"/>
</component>
</collection>
</package>
--- a/symbian3/mw/gsprofilesrv/package_definition_3.0.xml Wed Feb 03 19:36:09 2010 +0000
+++ b/symbian3/mw/gsprofilesrv/package_definition_3.0.xml Wed Feb 03 20:06:22 2010 +0000
@@ -7,15 +7,15 @@
</component>
</collection>
<collection id="profilesservices" name="Profiles Services" level="server">
- <component id="profileengine" filter="s60" name="Profile Engine" introduced="9.1">
- <unit bldFile="profilesservices/profileengine/group"/>
- </component>
<component id="filelist" filter="s60" name="File List" introduced="9.1">
<unit bldFile="profilesservices/filelist/group"/>
</component>
<component id="mediafilelist" filter="s60" name="Media File List" introduced="^2">
<unit bldFile="profilesservices/mediafilelist/group"/>
</component>
+ <component id="profileengine" filter="s60" name="Profile Engine" introduced="9.1">
+ <unit bldFile="profilesservices/profileengine/group"/>
+ </component>
<component id="ringingtone3dplugin" filter="s60" name="Ringing Tone 3D Plugin" class="plugin" introduced="^2">
<unit bldFile="profilesservices/ringingtone3dplugin/group"/>
</component>
--- a/symbian3/mw/hapticsservices/package_definition_3.0.xml Wed Feb 03 19:36:09 2010 +0000
+++ b/symbian3/mw/hapticsservices/package_definition_3.0.xml Wed Feb 03 20:06:22 2010 +0000
@@ -1,13 +1,29 @@
<?xml version="1.0" encoding="UTF-8"?>
<SystemDefinition schema="3.0.0">
- <package id="hapticsservices" name="Haptics Services" levels="fw api">
+ <package id="hapticsservices" name="Haptics Services" levels="fw server api">
+ <collection id="tacticonserver" name="Tacticon Server" level="server">
+ <!-- collection is really a component. Move down a directory -->
+ <component id="tacticonserver_build" filter="s60" name="Tacticon Server Build" introduced="^3">
+ <unit bldFile="tacticonserver/group"/>
+ <!-- clients and servers are suauly the same component. Consider moving pluign to a separate component if needed -->
+ </component>
+ </collection>
<collection id="tactilefeedback" name="Tactile Feedback" level="fw">
<component id="tactilearearegistry" filter="s60" name="Tactile Area Registry" introduced="^1">
<unit bldFile="tactilefeedback/tactilearearegistry/group"/>
</component>
+ <component id="tactilefeedbackresolver" filter="s60" name="Tactile Feedback Resolver" introduced="^1">
+ <unit bldFile="tactilefeedback/tactilefeedbackresolver/group"/>
+ </component>
+ <component id="tactileclickplugin" filter="s60" name="Tactile Click Plugin" class="plugin" introduced="^1">
+ <unit bldFile="tactilefeedback/tactileclickplugin/group"/>
+ </component>
<component id="tactilefeedbackclient" filter="s60" name="Tactile Feedback Client" introduced="^1">
<unit bldFile="tactilefeedback/tactilefeedbackclient/group"/>
</component>
+ <component id="tactileactionplugin" filter="s60" name="Tactile Action Plugin" class="plugin" introduced="^1">
+ <unit bldFile="tactilefeedback/tactileactionplugin/group"/>
+ </component>
<component id="tactilefeedback_build" filter="s60" name="Tactile Feedback Build" introduced="^1">
<!-- consider moving IBY to one fo the above components -->
<unit bldFile="tactilefeedback/group"/>
--- a/symbian3/mw/homescreensrv/package_definition_3.0.xml Wed Feb 03 19:36:09 2010 +0000
+++ b/symbian3/mw/homescreensrv/package_definition_3.0.xml Wed Feb 03 20:06:22 2010 +0000
@@ -1,7 +1,85 @@
<?xml version="1.0" encoding="UTF-8"?>
<SystemDefinition schema="3.0.0">
<package id="homescreensrv" name="Home Screen Services" levels="plugin framework server generic specific">
+ <collection id="xcfw" name="XML Content Framework" level="framework">
+ <!-- collection is really a component, needs to be moved down a directory -->
+ <component id="xcfw_build" filter="s60" name="XML Content Framework Build">
+ <unit bldFile="xcfw/group"/>
+ </component>
+ </collection>
+ <collection id="homescreenpluginsrv" name="Home Screen Plugin Service" level="plugin">
+ <component id="hspsdefinitionengine" filter="s60" name="HS Plugin Service Definition Engine">
+ <!-- <unit bldFile="homescreenpluginsrv/hspsdefinitionengine/group"/> -->
+ </component>
+ <component id="hspsdom" filter="s60" name="HS Plugin Service DOM">
+ <!-- <unit bldFile="homescreenpluginsrv/hspsdom/group"/> -->
+ </component>
+ <component id="hspstools" filter="s60" name="HS Server Tools">
+ <meta rel="config">
+ <defined condition="____HSPS_CFG_LOG_ON____"/>
+ </meta>
+ <!-- <unit bldFile="homescreenpluginsrv/hspstools/group"/> -->
+ </component>
+ <component id="hspspluginregistry" filter="s60" name="HS Plugin Registry">
+ <!-- <unit bldFile="homescreenpluginsrv/hspspluginregistry/group"/>-->
+ </component>
+ <component id="hspsmanager" filter="s60" name="HSPS Manager">
+ <!-- <unit bldFile="homescreenpluginsrv/hspsmanager/group"/>-->
+ </component>
+ <component id="hspsodt" filter="s60" name="HSPS Object Description Tree">
+ <!-- <unit bldFile="homescreenpluginsrv/hspsodt/group"/>-->
+ </component>
+ <component id="hspsresource" filter="s60" name="HS Plugin Server Resource">
+ <!-- <unit bldFile="homescreenpluginsrv/hspsresource/group"/>-->
+ </component>
+ <component id="hspsresult" filter="s60" name="HS Plugin Server Result">
+ <!-- <unit bldFile="homescreenpluginsrv/hspsresult/group"/>-->
+ </component>
+ <component id="homescreen_settings_api" filter="s60" name="HS Settings API" class="api">
+ <!-- <unit bldFile="homescreenpluginsrv/hspsresult/group"/>-->
+ </component>
+ <component id="homescreenpluginsrv_build" filter="s60" name="HSPS Build">
+ <!-- need to break this up into the self-contained components above and uncomment them -->
+ <unit bldFile="homescreenpluginsrv/group"/>
+ </component>
+ </collection>
+ <collection id="idlefw" name="Idle Framework" level="framework">
+ <meta rel="config">
+ <defined condition="RD_CUSTOMIZABLE_AI"/>
+ </meta>
+ <component id="idlefw_plugins" filter="s60" name="Idle Framework Plugins" class="plugin">
+ <!--<unit bldFile="idlefw/plugins/group"/>-->
+ </component>
+ <component id="hslaunch" filter="s60" name="Home Screen Launch">
+ <!--<unit bldFile="idlefw/plugins/group"/>-->
+ </component>
+ <component id="idlefw_build" filter="s60" name="Idle Framework Build">
+ <!--split this into components, or separate from the above components and move this down a directory -->
+ <unit bldFile="idlefw/group"/>
+ </component>
+ </collection>
+ <collection id="menucontentsrv" name="Menu Content Service" level="generic">
+ <component id="menusatinterface" filter="s60" name="Menu SAT Interface">
+ <unit bldFile="menucontentsrv/menusatinterface/group"/>
+ </component>
+ <component id="menucontentsrv_build" filter="s60" name="Menu Content Service Build">
+ <!--split this into components, or separate from the above component and move this down a directory -->
+ <unit bldFile="menucontentsrv/group"/>
+ </component>
+ </collection>
+ <collection id="backsteppingsrv" name="Back Stepping Service" level="server">
+ <!-- collection is really a component, needs to be moved down a directory -->
+ <component id="bsengine" name="Back Stepping Engine" filter="s60">
+ <unit bldFile="backsteppingsrv/group"/>
+ </component>
+ </collection>
<collection id="contentpublishingsrv" name="Content Publishing Service" level="server">
+ <component id="contentpublishingdebug" filter="s60" name="Content Publishing Debug">
+ <meta rel="config">
+ <defined condition="CONTENT_PUBLISHER_DEBUG"/>
+ </meta>
+ <!-- <unit bldFile="contentpublishingsrv/contentpublishingutils/contentpublishingdebug/group"/> -->
+ </component>
<component id="contentpublishingutils" filter="s60" name="Content Publishing Utils">
<unit bldFile="contentpublishingsrv/contentpublishingutils/group"/>
<!-- should only have one bld.inf, does the below need to be #included in the above ? -->
@@ -14,76 +92,52 @@
<unit bldFile="contentpublishingsrv/contentharvester/group"/>
</component>
<component id="contentpublishingsrv_build" filter="s60" name="Content Publishing Service Build">
+ <!-- need to remove links to the above components and just contain the IBY (or move the IBY into another component).
+ If keeping, it need to move down a directory.-->
<unit bldFile="contentpublishingsrv/group"/>
</component>
</collection>
- <collection id="backsteppingsrv" name="Back Stepping Service" level="server">
- <component id="bsengine" name="Back Stepping Engine" filter="s60">
- <unit bldFile="backsteppingsrv/group"/>
- </component>
- </collection>
- <collection id="xcfw" name="XML Content Framework" level="framework">
- <component id="xcfw_build" filter="s60" name="XML Content Framework Build">
- <unit bldFile="xcfw/group"/>
+ <collection id="contextutility" name="Context Utility" level="generic">
+ <!-- collection is really a component, needs to be moved down a directory -->
+ <component id="contextutility_build" name="Context Utility Build" filter="s60" introduced="^3">
+ <unit bldFile="contextutility/group"/>
</component>
</collection>
- <collection id="homescreenpluginsrv" name="Home Screen Plugin Service" level="plugin">
- <component id="hspsdefinitionengine" filter="s60" name="HS Plugin Service Definition Engine">
- <unit bldFile="homescreenpluginsrv/hspsdefinitionengine/group"/>
- </component>
- <component id="hspsdom" filter="s60" name="HS Plugin Service DOM">
- <unit bldFile="homescreenpluginsrv/hspsdom/group"/>
- </component>
- <component id="hspspluginregistry" filter="s60" name="HS Plugin Registry">
- <unit bldFile="homescreenpluginsrv/hspspluginregistry/group"/>
+ <collection id="contentcontrolsrv" name="Content Control Service" level="server">
+ <component id="ccsrv" name="Content Control Service" filter="s60" introduced="^3">
+ <unit bldFile="contentcontrolsrv/ccsrv/group"/>
</component>
- <component id="hspsmanager" filter="s60" name="HS Plugin Service Manager">
- <unit bldFile="homescreenpluginsrv/hspsmanager/group"/>
- </component>
- <component id="hspsodt" filter="s60" name="HS Plugin Service Object Description Tree">
- <unit bldFile="homescreenpluginsrv/hspsodt/group"/>
+ <component id="ccsrvapi" name="Content Control Service API" filter="s60" introduced="^3" class="api">
+ <unit bldFile="contentcontrolsrv/ccsrvapi/group"/>
</component>
- <component id="hspsresource" filter="s60" name="HS Plugin Server Resource">
- <unit bldFile="homescreenpluginsrv/hspsresource/group"/>
- </component>
- <component id="hspsresult" filter="s60" name="HS Plugin Server Result">
- <unit bldFile="homescreenpluginsrv/hspsresult/group"/>
+ <component id="ccclientsession" name="Content Control Client Session" filter="s60" introduced="^3">
+ <unit bldFile="contentcontrolsrv/ccclientsession/group"/>
</component>
- <component id="hspstools" filter="s60" name="HS Server Tools">
- <unit bldFile="homescreenpluginsrv/hspstools/group"/>
- </component>
- <component id="homescreenpluginsrv_build" filter="s60" name="HS Plugin Service Build">
- <unit bldFile="homescreenpluginsrv/group"/>
+ <component id="hsccclient" name="HS Content Control Client" filter="s60" introduced="^3">
+ <unit bldFile="contentcontrolsrv/hsccclient/group"/>
</component>
- </collection>
- <collection id="idlefw" name="Idle Framework" level="framework">
- <component id="idlefw_plugins" filter="s60" name="Idle Framework Plugins" class="plugin">
- <unit bldFile="idlefw/plugins/group"/>
- <!-- does the next need to be #included? -->
- <!-- <unit bldFile="idlefw/plugins/pslnactiveidleplugin/group"/> -->
+ <component id="hscontentinfo" name="Home Screen Content Info" filter="s60" introduced="^3">
+ <unit bldFile="contentcontrolsrv/hscontentinfo/group"/>
</component>
- <component id="idlefw_build" filter="s60" name="Idle Framework Build">
- <unit bldFile="idlefw/group"/>
- </component>
- </collection>
- <collection id="menucontentsrv" name="Menu Content Service" level="generic">
- <component id="menusatinterface" filter="s60" name="Menu SAT Interface">
- <unit bldFile="menucontentsrv/menusatinterface/group"/>
- </component>
- <component id="menucontentsrv_build" filter="s60" name="Menu Content Service Build">
- <unit bldFile="menucontentsrv/group"/>
+ <component id="contentcontrolsrv_build" name="Content Control Service Build" filter="s60" introduced="^3">
+ <!-- need to remove links to the above components and just contain the IBY (or move the IBY into another component).
+ If keeping, it need to move down a directory.-->
+ <unit bldFile="contentcontrolsrv/group"/>
</component>
</collection>
<collection id="homescreensrv_info" name="Home Screen Services Info" level="specific">
<component id="homescreensrv_plat" filter="s60" name="Home Screen Services Platform Interfaces" class="api">
<unit bldFile="homescreensrv_plat/group"/>
- <!-- should the following be #included in the above? -->
- <!-- <unit bldFile="homescreensrv_plat/action_handler_plugin_api/tsrc/group"/> -->
- <!-- <unit bldFile="homescreensrv_plat/content_harvester_plugin_api/tsrc/group"/> -->
- <!-- <unit bldFile="homescreensrv_plat/hs_widget_publisher_api/tsrc/group"/> -->
- <!-- <unit bldFile="homescreensrv_plat/menu_content_service_api/tsrc/group"/> -->
- <!-- <unit bldFile="homescreensrv_plat/menu_sat_interface_api/tsrc/group"/> -->
- </component>
+ </component>
+ <component id="homescreensrv_api_tests" filter="s60,api_test" name="Home Screen Services Platform API Tests" purpose="developement">
+ <!-- split into components or #include from common bld.inf -->
+ <unit bldFile="homescreensrv_plat/content_harvester_plugin_api/tsrc/group" />
+ <unit bldFile="homescreensrv_plat/menu_content_service_api/tsrc/group" />
+ <unit bldFile="homescreensrv_plat/ai_utilities_api/internal/tsrc/group" />
+ <unit bldFile="homescreensrv_plat/action_handler_plugin_api/tsrc/group" />
+ <unit bldFile="homescreensrv_plat/menu_sat_interface_api/tsrc/group" />
+ <unit bldFile="homescreensrv_plat/sapi_homescreenplugin/tsrc/group" />
+ </component>
</collection>
</package>
</SystemDefinition>
--- a/symbian3/mw/imghandling/package_definition_3.0.xml Wed Feb 03 19:36:09 2010 +0000
+++ b/symbian3/mw/imghandling/package_definition_3.0.xml Wed Feb 03 20:06:22 2010 +0000
@@ -1,42 +1,26 @@
<?xml version="1.0" encoding="UTF-8"?>
<SystemDefinition schema="3.0.0">
<package id="imghandling" name="Image Handling" levels="lib util if">
- <collection id="library3gp" name="3GP Library" level="lib">
- <component id="lib3gpmp4" filter="s60" name="3GP MP4 Library" deprecated="^3">
- <!-- deprecated due to duplication -->
- <unit bldFile="3gplibrary/3gpmp4lib/group"/>
- <!-- does the test need to be #included in the above? -->
- <!-- <unit bldFile="3gplibrary/3gpmp4lib/tsrc/public/basic/group"/> -->
- </component>
- </collection>
<collection id="imagehandlinglib" name="Image Handling Library" level="lib">
+ <!-- collection is really a component, need to move down a directory -->
<component id="ihl" filter="s60" name="IHL">
<unit bldFile="imagehandlinglib/group"/>
</component>
+ <component id="imagehandlinglib_api" filter="s60,api_test" name="Image Handling Library API Test" purpose="development">
+ <unit bldFile="imagehandlinglib/tsrc/public/basic/group"/>
+ </component>
</collection>
<collection id="imagehandlingutilities" name="Image Handling Utilities" level="util">
- <component id="imageinfopopup" filter="s60" name="Image Info Popup">
- <unit bldFile="imagehandlingutilities/imageinfopopup/group"/>
- </component>
- <component id="imagepreview" filter="s60" name="Image Preview">
- <unit bldFile="imagehandlingutilities/imagepreview/group"/>
- </component>
<component id="thumbnailmanager" filter="s60" name="Thumbnail Manager">
<unit bldFile="imagehandlingutilities/thumbnailmanager/group"/>
</component>
- <component id="tvoutengine" filter="s60" name="TV Out Engine">
- <unit bldFile="imagehandlingutilities/tvoutengine/group"/>
- </component>
</collection>
<collection id="imghandling_info" name="Image Handling Info" level="if">
<component id="imagehandling_plat" filter="s60" name="Image Handling Platform Interfaces" class="api">
<unit bldFile="imagehandling_plat/group"/>
- <!-- <unit bldFile="imagehandling_plat/3gp_library_api/tsrc/group"/> -->
- <!-- <unit bldFile="imagehandling_plat/thumbnailmanager_api/tsrc/group"/> -->
</component>
- <component id="imghandling_build" filter="s60" name="Image Handling Build">
- <!-- system include from this needs to be moved to each #included bld.inf -->
- <unit bldFile="group"/>
+ <component id="imagehandling_api_test" filter="s60,api_test" name="Image Handling Platform API Test" purpose="development">
+ <unit bldFile="imagehandling_plat/thumbnailmanager_api/tsrc/group"/>
</component>
</collection>
</package>
--- a/symbian3/mw/imsrv/package_definition_3.0.xml Wed Feb 03 19:36:09 2010 +0000
+++ b/symbian3/mw/imsrv/package_definition_3.0.xml Wed Feb 03 20:06:22 2010 +0000
@@ -1,82 +1,34 @@
<?xml version="1.0" encoding="UTF-8"?>
<SystemDefinition schema="3.0.0">
<package id="imsrv" name="Instant Messaging and Presence Services" levels="plugin framework server generic specific">
+ <collection id="ximpfw" name="XIMP Framework" level="framework">
+ <!-- collection is really a component. Needs to be moved down a directory -->
+ <component id="ximpfw_build" filter="s60" name="XIMP Framework Build">
+ <unit bldFile="ximpfw/group"/>
+ </component>
+ </collection>
<collection id="imservices" name="IM Services" level="generic">
<component id="imfeatureplugin" filter="s60" name="IM Feature Plugin" class="plugin" introduced="^2">
<unit bldFile="imservices/imfeatureplugin/group"/>
- <!-- should #include the test bld.inf if needed -->
- <!-- <unit bldFile="imservices/imfeatureplugin/srcimdatamodel/group"/> -->
- <!-- <unit bldFile="imservices/imfeatureplugin/srcimfrontend/group"/> -->
- <!-- <unit bldFile="imservices/imfeatureplugin/srcimoperations/group"/> -->
- <!-- <unit bldFile="imservices/imfeatureplugin/srcimprocessor/group"/> -->
</component>
<component id="searchfeatureplugin" filter="s60" name="Search Feature Plugin" class="plugin" introduced="^2">
<unit bldFile="imservices/searchfeatureplugin/group"/>
- <!-- should #include the test bld.inf if needed -->
- <!-- <unit bldFile="imservices/searchfeatureplugin/srcsearchdatamodel/group"/> -->
- <!-- <unit bldFile="imservices/searchfeatureplugin/srcsearchfrontend/group"/> -->
- <!-- <unit bldFile="imservices/searchfeatureplugin/srcsearchoperations/group"/> -->
- <!-- <unit bldFile="imservices/searchfeatureplugin/srcsearchprocessor/group"/> -->
</component>
<component id="xmppsettingsapi" filter="s60" name="XMPP Settings API" introduced="^2">
<unit bldFile="imservices/xmppsettingsapi/group"/>
- <!-- should #include the test bld.inf if needed -->
- <!-- <unit bldFile="imservices/xmppsettingsapi/tsrc/group"/> -->
</component>
<component id="xmppsettingsfetcher" filter="s60" name="XMPP Settings Fetcher" introduced="^2">
<unit bldFile="imservices/xmppsettingsfetcher/group"/>
- <!-- should #include the test bld.inf if needed -->
- <!-- <unit bldFile="imservices/xmppsettingsfetcher/tsrc/xmppsettingsfetchermt/group"/> -->
</component>
<component id="ossprotocoladaptation" filter="s60" name="OSS Protocol Adaptation" class="plugin" introduced="^2">
<unit bldFile="imservices/ossprotocoladaptation/group"/>
- <!-- <unit bldFile="imservices/ossprotocoladaptation/dataconvlib/group"/> -->
- <!-- should #include the test bld.infs if needed -->
- <!-- <unit bldFile="imservices/ossprotocoladaptation/tsrc/ossadapmt/group"/> -->
</component>
<component id="instantmessagingcache" filter="s60" name="Instant Messaging Cache" introduced="^2">
<unit bldFile="imservices/instantmessagingcache/group"/>
- <!-- should #include the test bld.inf if needed -->
- <!-- <unit bldFile="imservices/instantmessagingcache/tsrc/group"/> -->
- </component>
- <component id="imservices_build" filter="s60" name="IM Services Build" introduced="^2">
- <unit bldFile="imservices/group"/>
- </component>
- </collection>
- <collection id="ximpfw" name="XIMP Framework" level="framework">
- <component id="ximpfw_core" filter="s60" name="XIMP Core">
- <!-- <unit bldFile="ximpfw/core/group"/> -->
- </component>
- <component id="presence" filter="s60" name="XIMP Presence">
- <!-- <unit bldFile="ximpfw/presence/group"/> -->
- </component>
- <component id="ximpfw_test" filter="s60" name="XIMP Framework Test" purpose="development">
- <!-- should these all be included in a single test bld.inf? -->
- <!-- <unit bldFile="ximpfw/tsrc/group"/> -->
- <!-- <unit bldFile="ximpfw/tsrc/src/t_presencewatching"/> -->
- <!-- <unit bldFile="ximpfw/tsrc/src/t_presencegroupmembermngt"/> -->
- <!-- <unit bldFile="ximpfw/tsrc/src/t_presenceblocking"/> -->
- <!-- <unit bldFile="ximpfw/tsrc/tsrcutils"/> -->
- <!-- <unit bldFile="ximpfw/tsrc/src/t_rootservices"/> -->
- <!-- <unit bldFile="ximpfw/tsrc/src/t_presenceall"/> -->
- <!-- <unit bldFile="ximpfw/tsrc/src/t_presencegrouplistmngt"/> -->
- <!-- <unit bldFile="ximpfw/tsrc/src/t_presencecache"/> -->
- <!-- <unit bldFile="ximpfw/tsrc/src/t_presencepublishing"/> -->
- <!-- <unit bldFile="ximpfw/tsrc/src/t_presencewatcherlistmngt"/> -->
- <!-- <unit bldFile="ximpfw/tsrc/tsrcprotocols"/> -->
- <!-- <unit bldFile="ximpfw/tsrc/tsrcprotocols/pr_prfwtestprotocol"/> -->
- <!-- <unit bldFile="ximpfw/tsrc/src/t_presencegrantrequestmngt"/> -->
- <!-- <unit bldFile="ximpfw/tsrc/src/t_sessionmng"/> -->
- <!-- <unit bldFile="ximpfw/tsrc/src/t_presenceauthorization"/> -->
- <!-- <unit bldFile="ximpfw/tsrc/src/t_eunittemplate"/> -->
- <!-- <unit bldFile="ximpfw/tsrc/src/t_utils"/> -->
</component>
</collection>
<collection id="brandingserver" name="Branding Server" level="specific">
- <component id="tools" filter="s60" name="Branding Server Tools">
- <!-- is this component needed? Can it be #included by the below bld.inf if it is? -->
- <!-- <unit bldFile="brandingserver/tools/bsimport/group"/> -->
- </component>
+ <!-- collection is really a component. Needs to be moved down a directory -->
<component id="brandingserver_build" filter="s60" name="Branding Server Build">
<unit bldFile="brandingserver/group"/>
</component>
@@ -84,27 +36,6 @@
<collection id="imsrv_info" name="Instant Messaging and Presence Services Info" level="specific">
<component id="imsrv_plat" filter="s60" name="Instant Messaging and Presence Services Platform Interfaces" class="api">
<unit bldFile="imsrv_plat/group"/>
- <!-- should #include these tests in the above bld.inf -->
- <!-- <unit bldFile="imsrv_plat/im_cache_client_api/tsrc/group"/> -->
- <!-- <unit bldFile="imsrv_plat/ximp_core_feature_plugin_api/tsrc/group"/> -->
- <!-- <unit bldFile="imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_eunittemplate"/> -->
- <!-- <unit bldFile="imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_presenceall"/> -->
- <!-- <unit bldFile="imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_presenceauthorization"/> -->
- <!-- <unit bldFile="imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_presenceblocking"/> -->
- <!-- <unit bldFile="imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_presencecache"/> -->
- <!-- <unit bldFile="imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_presencegrantrequestmngt"/> -->
- <!-- <unit bldFile="imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_presencegrouplistmngt"/> -->
- <!-- <unit bldFile="imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_presencegroupmembermngt"/> -->
- <!-- <unit bldFile="imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_presencepublishing"/> -->
- <!-- <unit bldFile="imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_presencewatcherlistmngt"/> -->
- <!-- <unit bldFile="imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_presencewatching"/> -->
- <!-- <unit bldFile="imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_rootservices"/> -->
- <!-- <unit bldFile="imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_sessionmng"/> -->
- <!-- <unit bldFile="imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_utils"/> -->
- <!-- <unit bldFile="imsrv_plat/ximp_core_feature_plugin_api/tsrc/tsrcprotocols"/> -->
- <!-- <unit bldFile="imsrv_plat/ximp_core_feature_plugin_api/tsrc/tsrcprotocols/pr_prfwtestprotocol"/> -->
- <!-- <unit bldFile="imsrv_plat/ximp_core_feature_plugin_api/tsrc/tsrcutils"/> -->
- <!-- <unit bldFile="imsrv_plat/xmpp_settings_api/tsrc/group"/> -->
</component>
</collection>
</package>
--- a/symbian3/mw/inputmethods/package_definition_3.0.xml Wed Feb 03 19:36:09 2010 +0000
+++ b/symbian3/mw/inputmethods/package_definition_3.0.xml Wed Feb 03 20:06:22 2010 +0000
@@ -3,19 +3,27 @@
<package id="inputmethods" name="Input Methods" levels="plugin engine framework">
<collection id="textinput" name="Text Input" level="framework">
<component id="ptienginev2" filter="s60" name="Predictive Text Input Engine">
- <unit bldFile="textinput/ptienginev2/group"/>
+ <meta rel="config">
+ <defined condition="RD_INTELLIGENT_TEXT_INPUT"/>
+ </meta>
+ <!--uncomment when configuration is turned on and textinput_build is removed-->
+ <!-- <unit bldFile="textinput/ptienginev2/group"/>-->
</component>
<component id="akninputlanguage" filter="s60" name="Avkon Input Language">
<unit bldFile="textinput/akninputlanguage/group"/>
</component>
<component id="peninputarc" filter="s60" name="Pen Input Arc">
<unit bldFile="textinput/peninputarc/group"/>
- <!-- <unit bldFile="textinput/peninputarc/src/peninputserverapp"/> -->
- <!-- <unit bldFile="textinput/peninputarc/utils/group"/> -->
</component>
<component id="peninputcommonctrls" filter="s60" name="Pen Input Common Controls">
<unit bldFile="textinput/peninputcommonctrls/group"/>
</component>
+ <component id="peninputhwrboxcn" filter="s60" name="Chinese Handwriting Recognition Box" class="plugin">
+ <unit bldFile="textinput/peninputhwrboxcn/group"/>
+ </component>
+ <component id="peninputvkbcn" filter="s60" name="Chinese Virtual Keyboard" class="plugin">
+ <unit bldFile="textinput/peninputvkbcn/group"/>
+ </component>
<component id="peninputcommonlayout" filter="s60" name="Pen Input Common Layout">
<unit bldFile="textinput/peninputcommonlayout/group"/>
</component>
@@ -25,12 +33,6 @@
<component id="peninputgenericvkb" filter="s60" name="Pen Input Generic Virtual Keyboard" class="plugin">
<unit bldFile="textinput/peninputgenericvkb/group"/>
</component>
- <component id="peninputhwrboxcn" filter="s60" name="Chinese Handwriting Recognition Box" class="plugin">
- <unit bldFile="textinput/peninputhwrboxcn/group"/>
- </component>
- <component id="peninputvkbcn" filter="s60" name="Chinese Virtual Keyboard" class="plugin">
- <unit bldFile="textinput/peninputvkbcn/group"/>
- </component>
<component id="peninputcommonctrlsjp" filter="s60" name="Pen Input Common Controls Japanese">
<unit bldFile="textinput/peninputcommonctrlsjp/group"/>
</component>
@@ -40,23 +42,17 @@
<component id="peninputvkbjp" filter="s60" name="Japanese Virtual Keyboard" class="plugin">
<unit bldFile="textinput/peninputvkbjp/group"/>
</component>
- <component id="textinput_build" filter="s60" name="Text Input Build">
- <!--needs #ifdef moved to confguration or individual bld.inf files -->
- <unit bldFile="textinput/group"/>
- </component>
<component id="gslangplugin" filter="s60" name="GS Language Plugin" class="plugin">
<unit bldFile="textinput/gslangplugin"/>
</component>
+ <component id="textinput_build" filter="s60" name="Text Input Build">
+ <!--needed for #ifdef, can be removed when configuration is implemented -->
+ <unit bldFile="textinput/group"/>
+ </component>
</collection>
<collection id="fep" name="FEP" level="engine">
<component id="aknfep" filter="s60" name="Avkon FEP" class="plugin">
<unit bldFile="fep/aknfep/group"/>
- <!-- <unit bldFile="fep/aknfep/peninputplugins/peninputimeplugincn/group"/> -->
- <!-- <unit bldFile="fep/aknfep/peninputplugins/peninputimeplugingeneric/group"/> -->
- <!-- <unit bldFile="fep/aknfep/peninputplugins/peninputimepluginitut/group"/> -->
- <!-- <unit bldFile="fep/aknfep/peninputplugins/peninputimepluginjp/group"/> -->
- <!-- <unit bldFile="fep/aknfep/uiplugins/aknfepuiinterface/avkonimpl/group"/> -->
- <!-- <unit bldFile="fep/aknfep/uiplugins/aknfepuiinterface/group"/> -->
</component>
<component id="frontendprocessor" name="Front End Processor" purpose="mandatory">
<unit bldFile="fep/frontendprocessor/group" mrp="fep/frontendprocessor/group/app-framework_fepbase.mrp"/>
@@ -65,16 +61,18 @@
<collection id="inputmethods_info" name="Input Methods Info" level="framework">
<component id="inputmethods_plat" filter="s60" name="Input Methods Platform Interfaces" class="api">
<unit bldFile="inputmethods_plat/group"/>
- <!-- <unit bldFile="inputmethods_plat/aknfep_uiinterface_api/tsrc/group"/> -->
- <!-- <unit bldFile="inputmethods_plat/pen_input_server_api/tsrc/group"/> -->
- <!-- <unit bldFile="inputmethods_plat/ptiengine_hwr_api/tsrc/group"/> -->
- <!-- <unit bldFile="inputmethods_plat/ptiengine_key_definations_api/tsrc/group"/> -->
</component>
<component id="inputmethods_pub" filter="s60" name="Input Methods Public Interfaces" class="api">
<unit bldFile="inputmethods_pub/group"/>
- <!-- <unit bldFile="inputmethods_pub/input_language_info_api/tsrc/group"/> -->
- <!-- <unit bldFile="inputmethods_pub/optical_character_recognition_api/tsrc/group"/> -->
- <!-- <unit bldFile="inputmethods_pub/ptiengine_iti_api/tsrc/group"/> -->
+ </component>
+ <component id="inputmethods_test" filter="s60,api_test" name="Input Methods Tests" introduced="^2" purpose="development">
+ <!-- can only have one unit, #include from a single bld.inf -->
+ <unit bldFile="inputmethods_plat/pen_input_server_api/tsrc/group"/>
+ <unit bldFile="inputmethods_plat/ptiengine_hwr_api/tsrc/group"/>
+ <unit bldFile="inputmethods_plat/aknfep_uiinterface_api/tsrc/group"/>
+ </component>
+ <component id="inputmethods_api_tests" filter="s60,api_test" name="Input Methods API Tests" introduced="^2" purpose="development">
+ <unit bldFile="tsrc/group"/>
</component>
<component id="inputmethods_metadata" name="Input Methods Metadata" class="config" introduced="^2" purpose="development" target="desktop">
<unit mrp="inputmethods_info/inputmethods_metadata/inputmethods_metadata.mrp"/>
--- a/symbian3/mw/ipappprotocols/package_definition_3.0.xml Wed Feb 03 19:36:09 2010 +0000
+++ b/symbian3/mw/ipappprotocols/package_definition_3.0.xml Wed Feb 03 20:06:22 2010 +0000
@@ -2,29 +2,11 @@
<SystemDefinition schema="3.0.0">
<package id="ipappprotocols" name="IP App Protocols" levels="plugin conn server if">
<collection id="rtp" name="RTP" level="server">
+ <component id="srtpstack" filter="s60" name="SRTP Stack">
+ <unit bldFile="rtp/srtpstack/group"/>
+ </component>
<component id="rtpstack" filter="s60" name="RTP Stack">
<unit bldFile="rtp/rtpstack/group"/>
- <!-- <unit bldFile="rtp/rtpstack/tsrc/ut_rtpstack/group"/> -->
- </component>
- </collection>
- <collection id="sipplugins" name="SIP Plugins" level="plugin">
- <component id="sippwlanplugin" filter="s60" name="SIP WLAN Plugin" class="plugin">
- <unit bldFile="sipplugins/sippwlanplugin/group"/>
- </component>
- <component id="sippsipsettingsui" filter="s60" name="SIP Settings UI" class="plugin">
- <unit bldFile="sipplugins/sippsipsettingsui/group"/>
- <!-- <unit bldFile="sipplugins/sippsipsettingsui/tsrc/ut_sipsettingsui/group"/> -->
- </component>
- <component id="sippdevmgmtsipadapter" filter="s60" name="Device Management SIP Settings Adapter" class="plugin">
- <unit bldFile="sipplugins/sippdevmgmtsipadapter/group"/>
- <!-- <unit bldFile="sipplugins/sippdevmgmtsipadapter/tsrc/ut_cnsmldmsipadapter/group"/> -->
- </component>
- <component id="sippsystemstatemonitor" filter="s60" name="SIP System State Monitor" class="plugin">
- <unit bldFile="sipplugins/sippsystemstatemonitor/group"/>
- </component>
- <component id="srtpstack" filter="s60" name="SRTP Stack">
- <unit bldFile="rtp/srtpstack/group"/>
- <!-- <unit bldFile="rtp/srtpstack/tsrc/ut_srtpstack/group"/> -->
</component>
</collection>
<collection id="realtimenetprots" name="Real Time Net Protocols" level="server">
@@ -36,6 +18,23 @@
<unit version="2" bldFile="realtimenetprots/sipfw/Group" mrp="realtimenetprots/sipfw/Group/mm-protocols_SIP2_Com.mrp"/>
</component>
</collection>
+ <collection id="sipplugins" name="SIP Plugins" level="plugin">
+ <component id="sippwlanplugin" filter="s60" name="SIP WLAN Plugin" class="plugin">
+ <unit bldFile="sipplugins/sippwlanplugin/group"/>
+ </component>
+ <component id="sippsipsettingsui" filter="s60" name="SIP Settings UI" class="plugin">
+ <unit bldFile="sipplugins/sippsipsettingsui/group"/>
+ </component>
+ <component id="sippdevmgmtsipadapter" filter="s60" name="Device Management SIP Settings Adapter" class="plugin">
+ <unit bldFile="sipplugins/sippdevmgmtsipadapter/group"/>
+ </component>
+ <component id="sippsystemstatemonitor" filter="s60" name="SIP System State Monitor" class="plugin">
+ <unit bldFile="sipplugins/sippsystemstatemonitor/group"/>
+ </component>
+ <component id="sippsipadapter" filter="s60" name="SIP Adapter" class="plugin" introduced="^3">
+ <unit bldFile="sipplugins/sippsipadapter/group"/>
+ </component>
+ </collection>
<collection id="sipproviderplugins" name="SIP Provider Plugins" level="conn">
<component id="sipprovider" name="SIP Provider" introduced="^2" purpose="optional" class="plugin">
<unit bldFile="sipproviderplugins/sipprovider/group" mrp="sipproviderplugins/sipprovider/group/mm-protocols_SipProvider.mrp"/>
--- a/symbian3/mw/ipappsrv/package_definition_3.0.xml Wed Feb 03 19:36:09 2010 +0000
+++ b/symbian3/mw/ipappsrv/package_definition_3.0.xml Wed Feb 03 20:06:22 2010 +0000
@@ -1,211 +1,46 @@
<?xml version="1.0" encoding="UTF-8"?>
<SystemDefinition schema="3.0.0">
<package id="ipappsrv" name="IP App Services" levels="framework generic server conn plugin">
- <collection id="multimediacommscontroller" name="Multimedia Comms Controller" level="conn">
- <component id="mmccinterface" filter="s60" name="MMCC Interface">
- <!-- <unit bldFile="multimediacommscontroller/mmccinterface/group"/> -->
- <!-- <unit bldFile="multimediacommscontroller/mmccinterface/tsrc/ut_interface/group"/> -->
- </component>
- <component id="mmccjitterbuffer" filter="s60" name="Jitter Buffer">
- <!-- <unit bldFile="multimediacommscontroller/mmccjitterbuffer/group"/> -->
- <!-- <unit bldFile="multimediacommscontroller/mmccjitterbuffer/tsrc/ut_jitterbuffer/group"/> -->
- </component>
- <component id="mmccqoscontroller" filter="s60" name="QoS Controller">
- <!-- <unit bldFile="multimediacommscontroller/mmccqoscontroller/group"/> -->
- <!-- <unit bldFile="multimediacommscontroller/mmccqoscontroller/tsrc/ut_qoscontroller/group"/> -->
- </component>
- <component id="mmccmultiplexer" filter="s60" name="MMCC Multiplexer">
- <!-- <unit bldFile="multimediacommscontroller/mmccmultiplexer/group"/> -->
- <!-- <unit bldFile="multimediacommscontroller/mmccmultiplexer/tsrc/ut_multiplexer/group"/> -->
- </component>
- <component id="mmccsubcontroller" filter="s60" name="MMCC Subcontroller">
- <!-- <unit bldFile="multimediacommscontroller/mmccsubcontroller/group"/> -->
- <!-- <unit bldFile="multimediacommscontroller/mmccsubcontroller/tsrc/ut_rtpmediaclock/group"/> -->
- <!-- <unit bldFile="multimediacommscontroller/mmccsubcontroller/tsrc/ut_subcontroller/group"/> -->
- </component>
- <component id="mmcccontroller" filter="s60" name="MMCC Controller" class="plugin">
- <!-- <unit bldFile="multimediacommscontroller/mmcccontroller/group"/> -->
- <!-- <unit bldFile="multimediacommscontroller/mmcccontroller/tsrc/ut_controller/group"/> -->
- </component>
- <component id="mmccredpayloadformat" filter="s60" name="Redundancy Payload Format" class="plugin">
- <!-- <unit bldFile="multimediacommscontroller/mmccredpayloadformat/group"/> -->
- <!-- <unit bldFile="multimediacommscontroller/mmccredpayloadformat/tsrc/ut_redpayloadformat/group"/> -->
- </component>
- <component id="mmccamrpayloadformat" filter="s60" name="AMR Payload Format" class="plugin">
- <!-- <unit bldFile="multimediacommscontroller/mmccamrpayloadformat/group"/> -->
- <!-- <unit bldFile="multimediacommscontroller/mmccamrpayloadformat/tsrc/ut_amrpayloadformat/group"/> -->
- </component>
- <component id="mmccg711payloadformat" filter="s60" name="G711 Payload Format" class="plugin">
- <!-- <unit bldFile="multimediacommscontroller/mmccg711payloadformat/group"/> -->
- <!-- <unit bldFile="multimediacommscontroller/mmccg711payloadformat/tsrc/ut_g711payloadformat/group"/> -->
- </component>
- <component id="mmccg729payloadformat" filter="s60" name="G729 Payload Format" class="plugin">
- <!-- <unit bldFile="multimediacommscontroller/mmccg729payloadformat/group"/> -->
- <!-- <unit bldFile="multimediacommscontroller/mmccg729payloadformat/tsrc/ut_g729payloadformat/group"/> -->
+ <collection id="natfw" name="NAT Framework" level="framework">
+ <!-- collection is really a component. Need to move down a directory -->
+ <component id="natfw_build" filter="s60" name="NAT Framework Build" introduced="^2">
+ <unit bldFile="natfw/group"/>
</component>
- <component id="mmccilbcpayloadformat" filter="s60" name="ILBC Payload Format" class="plugin">
- <!-- <unit bldFile="multimediacommscontroller/mmccilbcpayloadformat/group"/> -->
- <!-- <unit bldFile="multimediacommscontroller/mmccilbcpayloadformat/tsrc/ut_ilbcpayloadformat/group"/> -->
- </component>
- <component id="mmccdtmfpayloadformat" filter="s60" name="DTMF Payload Format" class="plugin">
- <!-- <unit bldFile="multimediacommscontroller/mmccdtmfpayloadformat/group"/> -->
- <!-- <unit bldFile="multimediacommscontroller/mmccdtmfpayloadformat/tsrc/ut_dtmfpayloadformat/group"/> -->
- </component>
- <component id="mmccrtpsourcesink" filter="s60" name="RTP Source Sink" class="plugin">
- <!-- <unit bldFile="multimediacommscontroller/mmccrtpsourcesink/group"/> -->
- <!-- <unit bldFile="multimediacommscontroller/mmccrtpsourcesink/tsrc/ut_rtpsourcesink/group"/> -->
- </component>
- <component id="mmccvideosourcesink" filter="s60" name="Video Source Sink" class="plugin">
- <!-- <unit bldFile="multimediacommscontroller/mmccvideosourcesink/group"/> -->
- <!-- <unit bldFile="multimediacommscontroller/mmccvideosourcesink/tsrc/ut_videosourcesink/group"/> -->
- </component>
- <component id="mmcch263payloadformat" filter="s60" name="H263 Payload Format" class="plugin">
- <!-- <unit bldFile="multimediacommscontroller/mmcch263payloadformat/group"/> -->
- <!-- <unit bldFile="multimediacommscontroller/mmcch263payloadformat/tsrc/ut_h263payloadformat/group"/> -->
- </component>
- <component id="mmccanypayloadformat" filter="s60" name="Any Payload Format" class="plugin">
- <!-- <unit bldFile="multimediacommscontroller/mmccanypayloadformat/group"/> -->
- <!-- <unit bldFile="multimediacommscontroller/mmccanypayloadformat/tsrc/ut_anypayloadformat/group"/> -->
- </component>
- <component id="mmccfilesourcesink" filter="s60" name="MMCC File Source Sink" class="plugin">
- <!-- <unit bldFile="multimediacommscontroller/mmccfilesourcesink/group"/> -->
- <!-- <unit bldFile="multimediacommscontroller/mmccfilesourcesink/tsrc/ut_filesourcesink/group"/> -->
- </component>
- <component id="mmccanysourcesink" filter="s60" name="Any Source Sink" class="plugin">
- <!-- <unit bldFile="multimediacommscontroller/mmccanysourcesink/group"/> -->
- <!-- <unit bldFile="multimediacommscontroller/mmccanysourcesink/tsrc/ut_anysourcesink/group"/> -->
- </component>
- <component id="mmccavcpayloadformat" filter="s60" name="AVC Payload Format" class="plugin">
- <!-- <unit bldFile="multimediacommscontroller/mmccavcpayloadformat/group"/> -->
- <!-- <unit bldFile="multimediacommscontroller/mmccavcpayloadformat/tsrc/ut_avcpayloadformat/group"/> -->
- </component>
+ </collection>
+ <collection id="multimediacommscontroller" name="Multimedia Comms Controller" level="conn">
+ <!-- collection is really a component. Need to move down a directory -->
<component id="multimediacommscontroller_build" filter="s60" name="Multimedia Comms Controller Build">
- <!-- contents of this component need to be distributed out to the other commented-out bld.infs or the other components need to be collapsed into one -->
<unit bldFile="multimediacommscontroller/group"/>
</component>
- <component id="multimediacommscontroller_test" filter="s60" name="Multimedia Comms Controller Test" purpose="development">
- <!-- <unit bldFile="multimediacommscontroller/tsrc/testconsoles/mcpsubthreads/dptests/group"/> -->
- <!-- <unit bldFile="multimediacommscontroller/tsrc/testconsoles/mcpsubthreads/clienttests/group"/> -->
- <!-- <unit bldFile="multimediacommscontroller/tsrc/componenttests/group"/> -->
- <!-- <unit bldFile="multimediacommscontroller/tsrc/subcontrollerstub/group"/> -->
- <!-- <unit bldFile="multimediacommscontroller/tsrc/testconsoles/jitterbuffertestconsole/group"/> -->
- <!-- <unit bldFile="multimediacommscontroller/tsrc/testconsoles/rtpsourcesink/group"/> -->
- <!-- <unit bldFile="multimediacommscontroller/tsrc/testconsoles/mcpconsole/group"/> -->
- </component>
</collection>
<collection id="multimediacommsengine" name="Multimedia Comms Engine" level="generic">
- <component id="mmcesrv" filter="s60" name="Multimedia Comms Engine Server">
- <!-- <unit bldFile="multimediacommsengine/mmcesrv/group"/> -->
- <!-- <unit bldFile="multimediacommsengine/mmcesrv/mmceevent/tsrc/ut_event/group"/> -->
- <!-- <unit bldFile="multimediacommsengine/mmcesrv/mmceevent/tsrc/ut_event/sip_stub/group"/> -->
- <!-- <unit bldFile="multimediacommsengine/mmcesrv/mmcemediamanager/tsrc/ut_mediamanager/group"/> -->
- <!-- <unit bldFile="multimediacommsengine/mmcesrv/mmceserver/tsrc/ut_server/group"/> -->
- </component>
- <component id="mmcecli" filter="s60" name="Multimedia Comms Engine Client">
- <!-- <unit bldFile="multimediacommsengine/mmcecli/group"/> -->
- </component>
- <component id="mmcefloorctrlengine" filter="s60" name="MCE Floor Control Engine">
- <!-- <unit bldFile="multimediacommsengine/mmcefloorctrlengine/group"/> -->
- <!-- <unit bldFile="multimediacommsengine/mmcefloorctrlengine/tsrc/ut_floorctrlengine/fctestpplugin/group"/> -->
- <!-- <unit bldFile="multimediacommsengine/mmcefloorctrlengine/tsrc/ut_floorctrlengine/fctestpplugin2/group"/> -->
- <!-- <unit bldFile="multimediacommsengine/mmcefloorctrlengine/tsrc/ut_floorctrlengine/group"/> -->
- </component>
- <component id="mmcefloorctrlplugin" filter="s60" name="MCE Floor Control Plugin" class="plugin">
- <!-- <unit bldFile="multimediacommsengine/mmcefloorctrlplugin/group"/> -->
- <!-- <unit bldFile="multimediacommsengine/mmcefloorctrlplugin/tsrc/ut_floorctrlplugin/group"/> -->
- </component>
+ <!-- collection is really a component. Need to move down a directory -->
<component id="multimediacommsengine_build" filter="s60" name="Multimedia Comms Engine Build">
- <!-- contents of this component need to be distributed out to the other commented-out bld.infs or the other components need to be collapsed into one -->
<unit bldFile="multimediacommsengine/group"/>
</component>
- <component id="multimediacommsengine_test" filter="s60" name="Multimedia Comms Engine Test" purpose="development">
- <!-- <unit bldFile="multimediacommsengine/tsrc/mcetestui/mcetestuiplugin/group"/> -->
- <!-- <unit bldFile="multimediacommsengine/tsrc/mcetestui/group"/> -->
- <!-- <unit bldFile="multimediacommsengine/tsrc/testdriver/siptester/ttcnresolverplugin/group"/> -->
- <!-- <unit bldFile="multimediacommsengine/tsrc/mmctestdriver/group"/> -->
- <!-- <unit bldFile="multimediacommsengine/tsrc/mmctestdriver/mcetester/iceplugin_stub/group"/> -->
- <!-- <unit bldFile="multimediacommsengine/tsrc/mmctestdriver/mcetester/ttcnresolverplugin/group"/> -->
- <!-- <unit bldFile="multimediacommsengine/tsrc/testdriver/siptester/ttcnresolverplugin2/group"/> -->
- <!-- <unit bldFile="multimediacommsengine/tsrc/mcetestui/mcetestuiengine/group"/> -->
- <!-- <unit bldFile="multimediacommsengine/tsrc/testdriver/group/s60_public_sdk"/> -->
- <!-- <unit bldFile="multimediacommsengine/tsrc/mmctestdriver/mcetester/iceplugin_stub/tsrc/test/group"/> -->
- <!-- <unit bldFile="multimediacommsengine/tsrc/testdriver/group"/> -->
- <!-- <unit bldFile="multimediacommsengine/tsrc/mmctestdriver/mcetester/voipplugin/group"/> -->
- </component>
- </collection>
- <collection id="natfw" name="NAT Framework" level="framework">
- <component id="natfwsettings" filter="s60" name="NAT Framework Settings" introduced="^2">
- <!-- <unit bldFile="natfw/natfwsettings/group"/> -->
- <!-- <unit bldFile="natfw/natfwsettings/tsrc/ut_cnatfwnatsettings/group"/> -->
- </component>
- <component id="natfwconnectionmultiplexer" filter="s60" name="NAT Framework Connection Multiplexer" introduced="^2">
- <!-- <unit bldFile="natfw/natfwconnectionmultiplexer/group"/> -->
- <!-- <unit bldFile="natfw/natfwconnectionmultiplexer/tsrc/muxtestconsole/group"/> -->
- <!-- <unit bldFile="natfw/natfwconnectionmultiplexer/tsrc/ut_connectionmultiplexer/group"/> -->
- </component>
- <component id="natfwclient" filter="s60" name="NAT Framework Client" introduced="^2">
- <!-- <unit bldFile="natfw/natfwclient/group"/> -->
- <!-- <unit bldFile="natfw/natfwclient/tsrc/ut_natfwclient/group"/> -->
- </component>
- <component id="natfwsocketmediaconnwrapper" filter="s60" name="Socket Media Connection Wrapper" introduced="^2">
- <!-- <unit bldFile="natfw/natfwsocketmediaconnwrapper/group"/> -->
- <!-- <unit bldFile="natfw/natfwsocketmediaconnwrapper/tsrc/ut_socketmediaconnwrapper/group"/> -->
- </component>
- <component id="natfwunsaf_protocols" filter="s60" name="UNSAF Protocols" introduced="^2">
- <!-- consider expanding name to UNilateral Self- Address Fixing Protocols -->
- <!-- <unit bldFile="natfw/natfwunsaf_protocols/group"/> -->
- <!-- <unit bldFile="natfw/natfwunsaf_protocols/tsrc/ut_unsaf_codec/group"/> -->
- <!-- <unit bldFile="natfw/natfwunsaf_protocols/tsrc/ut_unsaf_transport/group"/> -->
- </component>
- <component id="natfwstunturnclient" filter="s60" name="STUN TURN Client" introduced="^2">
- <!-- <unit bldFile="natfw/natfwstunturnclient/group"/> -->
- <!-- <unit bldFile="natfw/natfwstunturnclient/tsrc/ut_stunturnclient/group"/> -->
- </component>
- <component id="natfwstunserver" filter="s60" name="STUN Server" introduced="^2">
- <!-- <unit bldFile="natfw/natfwstunserver/group"/> -->
- <!-- <unit bldFile="natfw/natfwstunserver/tsrc/ut_cnatfwstunsrv/group"/> -->
- </component>
- <component id="natfwicecandidatehandler" filter="s60" name="ICE Candidate Handler" class="plugin" introduced="^2">
- <!-- <unit bldFile="natfw/natfwicecandidatehandler/group"/> -->
- <!-- <unit bldFile="natfw/natfwicecandidatehandler/tsrc/ut_icecandidatehandler/group"/> -->
- </component>
- <component id="natfwstunplugin" filter="s60" name="STUN Plugin" class="plugin" introduced="^2">
- <!-- <unit bldFile="natfw/natfwstunplugin/group"/> -->
- <!-- <unit bldFile="natfw/natfwstunplugin/tsrc/ut_cnatfwstunplugin/group"/> -->
- </component>
- <component id="natfwturnplugin" filter="s60" name="TURN Plugin" class="plugin" introduced="^2">
- <!-- <unit bldFile="natfw/natfwturnplugin/group"/> -->
- <!-- <unit bldFile="natfw/natfwturnplugin/tsrc/ut_cnatfwturnplugin/group"/> -->
- </component>
- <component id="natfw_build" filter="s60" name="NAT Framework Build" introduced="^2">
- <!-- contents of this component need to be distributed out to the other commented-out bld.infs or the other components need to be collapsed into one -->
- <unit bldFile="natfw/group"/>
- </component>
- <component id="natfw_test" filter="s60" name="NAT Framework Test" purpose="development" introduced="^2">
- <!-- <unit bldFile="natfw/tsrc/natfwtestconsoles/natfwtestconsole/group"/> -->
- </component>
</collection>
<collection id="natplugins" name="NAT Plugins" level="plugin">
- <!-- are the extra test units in here needed at all? Either incorperate into main unit as test projects or remove-->
<component id="natpcliprovisioningnatfwadapter" filter="s60" name="Client Provisioning NAT Framework Traversal Adapter" class="plugin" introduced="^2">
<unit bldFile="natplugins/natpcliprovisioningnatfwadapter/group"/>
- <!-- <unit bldFile="natplugins/natpcliprovisioningnatfwadapter/tsrc/t_natfwtraversaladapter/group"/> -->
</component>
<component id="natpdevmgmtnatfwadapter" filter="s60" name="Device Management NAT Framework Traversal Adapter" class="plugin">
<unit bldFile="natplugins/natpdevmgmtnatfwadapter/group"/>
- <!-- <unit bldFile="natplugins/natpdevmgmtnatfwadapter/tsrc/ut_cnsmldmnatfwtraversaladapter/group"/> -->
</component>
<component id="natptraversalcontroller" filter="s60" name="NAT Traversal Controller" class="plugin">
<unit bldFile="natplugins/natptraversalcontroller/group"/>
- <!-- <unit bldFile="natplugins/natptraversalcontroller/tsrc/ut_nattraversalcontroller/group"/> -->
</component>
<component id="natpnatfwsdpprovider" filter="s60" name="NAT Framework SDP Provider" class="plugin">
<unit bldFile="natplugins/natpnatfwsdpprovider/group"/>
- <!-- <unit bldFile="natplugins/natpnatfwsdpprovider/tsrc/testconsole/group"/> -->
- <!-- <unit bldFile="natplugins/natpnatfwsdpprovider/tsrc/ut_natfwsdpprovider/group"/> -->
</component>
</collection>
<collection id="ipappsrv_info" name="IP App Services Info" level="plugin">
+ <component id="ipappsrv_plat" filter="s60" name="IP App Services Platform Interfaces" class="api">
+ <unit bldFile="ipappsrv_plat/group"/>
+ </component>
+ <component id="ipappsrv_build" name="IP App Services Build" filter="s60">
+ <!-- remove the #includes from here and rename as xxx ROM or move iby/sis files into another component-->
+ <unit mrp="group"/>
+ </component>
<component id="ipappsrv_metadata" name="IP App Services Metadata" class="config" introduced="^2" purpose="development" target="desktop">
<unit mrp="ipappsrv_info/ipappsrv_metadata/ipappsrv_metadata.mrp"/>
</component>
--- a/symbian3/mw/ipconnmgmt/package_definition_3.0.xml Wed Feb 03 19:36:09 2010 +0000
+++ b/symbian3/mw/ipconnmgmt/package_definition_3.0.xml Wed Feb 03 20:06:22 2010 +0000
@@ -1,11 +1,27 @@
<?xml version="1.0" encoding="UTF-8"?>
<SystemDefinition schema="3.0.0">
<package id="ipconnmgmt" name="IP Connectivity Management" levels="plugin framework server generic utils">
+ <collection id="accesspointcontrol" name="Access Point Control" level="plugin">
+ <component id="apcontrollistplugin" filter="s60" name="Access Point Control List Plugin" class="plugin" introduced="^2">
+ <unit bldFile="accesspointcontrol/apcontrollistplugin/group"/>
+ </component>
+ </collection>
<collection id="alwayson_net_plugin" name="Always Online Net Plugin" level="server">
<component id="pdpcontextmanager2" filter="s60" name="PDP Context Manager 2">
<unit bldFile="alwayson_net_plugin/pdpcontextmanager2/group"/>
</component>
</collection>
+ <collection id="apengine" name="Access Point Engine" level="framework">
+ <component id="apeng" filter="s60" name="Access Point Engine">
+ <unit bldFile="apengine/apeng/group"/>
+ </component>
+ <component id="apsettingshandlerui" filter="s60" name="Access Point Settings Handler UI">
+ <unit bldFile="apengine/apsettingshandlerui/group"/>
+ </component>
+ <component id="apsettingsplugin" filter="s60" name="Access Point Settings Plugin" class="plugin">
+ <unit bldFile="apengine/apsettingsplugin/group"/>
+ </component>
+ </collection>
<collection id="bearermanagement" name="Bearer Management" level="framework">
<component id="mpm" filter="s60" name="Mobility Policy Manager">
<unit bldFile="bearermanagement/mpm/group"/>
@@ -18,6 +34,14 @@
<unit bldFile="bearermanagement/group"/>
</component>
</collection>
+ <collection id="cmmanager" name="Connection Method Manager" level="framework">
+ <component id="cmmgr" filter="s60" name="CM Manager">
+ <unit bldFile="cmmanager/cmmgr/group"/>
+ </component>
+ <component id="gsconnsettingsplugin" filter="s60" name="GS Connection Settings Plugin" introduced="^3" class="plugin">
+ <unit bldFile="cmmanager/gsconnsettingsplugin/group"/>
+ </component>
+ </collection>
<collection id="connectionmonitoring" name="Connection Monitoring" level="server">
<component id="connectionmonitorplugin" filter="s60" name="Connection Monitor Plugin" class="plugin">
<unit bldFile="connectionmonitoring/connectionmonitorplugin/group"/>
@@ -34,25 +58,9 @@
<unit bldFile="connectionmonitoring/connmonext/group"/>
</component>
</collection>
- <collection id="accesspointcontrol" name="Access Point Control" level="plugin">
- <component id="apcontrollistplugin" filter="s60" name="Access Point Control List Plugin" class="plugin" introduced="^2">
- <unit bldFile="accesspointcontrol/apcontrollistplugin/group"/>
- </component>
- </collection>
- <collection id="apengine" name="Access Point Engine" level="framework">
- <component id="apeng" filter="s60" name="Access Point Engine">
- <unit bldFile="apengine/apeng/group"/>
- </component>
- <component id="apsettingshandlerui" filter="s60" name="Access Point Settings Handler UI">
- <unit bldFile="apengine/apsettingshandlerui/group"/>
- </component>
- <component id="apsettingsplugin" filter="s60" name="Access Point Settings Plugin" class="plugin">
- <unit bldFile="apengine/apsettingsplugin/group"/>
- </component>
- </collection>
- <collection id="cmmanager" name="Connection Method Manager" level="framework">
- <component id="cmmgr" filter="s60" name="CM Manager">
- <unit bldFile="cmmanager/cmmgr/group"/>
+ <collection id="connectionutilities" name="Connection Utilities" level="utils">
+ <component id="connectiondialogs" filter="s60" name="Connection Dialogs">
+ <unit bldFile="connectionutilities/connectiondialogs/group"/>
</component>
</collection>
<collection id="dbcreator" name="DB Creator" level="utils">
@@ -60,7 +68,11 @@
<unit bldFile="dbcreator/commsdatcreator/group"/>
</component>
<component id="commsdatcreatorrfsplugin" filter="s60" name="Comms Database Creator RFS Plugin" class="plugin" introduced="9.3">
- <unit bldFile="dbcreator/commsdatcreatorrfsplugin/group"/>
+ <meta rel="config">
+ <not-defined condition="WINSCW"/>
+ </meta>
+ <!-- uncomment when config is turned on -->
+ <!-- <unit bldFile="dbcreator/commsdatcreatorrfsplugin/group"/>-->
</component>
<component id="commsdatstartup" filter="s60" name="Comms Database Startup" introduced="9.3">
<unit bldFile="dbcreator/commsdatstartup/group"/>
@@ -69,15 +81,10 @@
<unit bldFile="dbcreator/dbcreatorexe/group"/>
</component>
<component id="dbcreator_build" filter="s60" name="DB Creator Build" introduced="9.3">
- <!-- consider moving exports to another component and getting rid of this one -->
+ <!-- move exports to another component, this is needed for the #ifndef for commsdatcreatorrfsplugin until configuration is in place-->
<unit bldFile="dbcreator/group"/>
</component>
</collection>
- <collection id="connectionutilities" name="Connection Utilities" level="utils">
- <component id="connectiondialogs" filter="s60" name="Connection Dialogs">
- <unit bldFile="connectionutilities/connectiondialogs/group"/>
- </component>
- </collection>
<collection id="ipconnmgmt_info" name="IP Connectivity Management Info" level="utils">
<component id="ipcm_pub" filter="s60" class="api" name="IP Connectivity Management Public Interfaces">
<unit bldFile="ipcm_pub/group"/>
@@ -85,6 +92,10 @@
<component id="ipcm_plat" filter="s60" class="api" name="IP Connectivity Management Platform Interfaces">
<unit bldFile="ipcm_plat/group"/>
</component>
+ <component id="ipcm_build" filter="s60" name="IP Connectivity Management Build">
+ <!-- need to move exports to another component, or maek this a config component and revmove the #includes -->
+ <unit bldFile="group"/>
+ </component>
</collection>
</package>
</SystemDefinition>
--- a/symbian3/mw/legacypresence/package_definition_3.0.xml Wed Feb 03 19:36:09 2010 +0000
+++ b/symbian3/mw/legacypresence/package_definition_3.0.xml Wed Feb 03 20:06:22 2010 +0000
@@ -2,93 +2,45 @@
<SystemDefinition schema="3.0.0">
<package id="legacypresence" name="Legacy Presence Services" levels="engine fw ui">
<collection id="xdmengine" name="XDM Engine" level="engine">
- <component id="xdmsettingsapi" filter="s60" name="XDM Settings Api">
- <!-- <unit bldFile="xdmengine/xdmsettingsapi/group"/> -->
- </component>
- <component id="xdmprovisioning" filter="s60" name="XDM Provisioning">
- <!-- <unit bldFile="xdmengine/xdmprovisioning/group"/> -->
- </component>
- <component id="xdmdevicemanagement" filter="s60" name="XDM Device Management">
- <!-- <unit bldFile="xdmengine/xdmdevicemanagement/group"/> -->
- </component>
+ <!-- collection is really a component. Need to move down a directory (eg xdm/xdmengine)-->
<component id="xdmengine_build" filter="s60" name="XDM Engine Build">
- <!-- should move the necesary parts into the above components, or collapse them all into one -->
<unit bldFile="xdmengine/group"/>
</component>
</collection>
<collection id="xdmsettingsui" name="XDM Settings UI" level="ui">
- <component id="xdmsettingsui_help" filter="s60" name="XDM Settings UI Help">
- <unit bldFile="xdmsettingsui/help/group"/>
- </component>
+ <!-- collection is really a component. Need to move down a directory (eg xdm/xdmsettingsui)-->
<component id="xdmsettingsui_build" filter="s60" name="XDM Settings UI Build">
<unit bldFile="xdmsettingsui/group"/>
</component>
</collection>
+ <collection id="xdmprotocols" name="XDM Protocols" level="fw">
+ <!-- collection is really a component. Need to move down a directory (eg xdm/xdmprotocols)-->
+ <component id="xdmprotocols_build" filter="s60" name="XDM Protocols Build">
+ <unit bldFile="xdmprotocols/group"/>
+ </component>
+ </collection>
<collection id="msgconnmanager" name="Messaging Connection Manager" level="fw">
+ <!-- collection is really a component. Need to move down a directory-->
<component id="msgconnmanager_build" filter="s60" name="Messaging Connection Manager Build">
<unit bldFile="msgconnmanager/group"/>
</component>
</collection>
- <collection id="presencefwsimpleadpt" name="Presence Framework SIMPLE Adaptation" level="fw">
- <component id="simpleplugin" filter="s60" class="plugin" name="SIMPLE Plugin">
- <unit bldFile="presencefwsimpleadpt/group"/>
- </component>
- </collection>
<collection id="presencesettingsui" name="Presence Settings UI" level="ui">
- <component id="presencesettingsui_help" filter="s60" name="Presence Settings UI Help">
- <unit bldFile="presencesettingsui/help/group"/>
- </component>
+ <!-- collection is really a component. Need to move down a directory-->
<component id="presencesettingsui_build" filter="s60" name="Presence Settings UI Build">
<unit bldFile="presencesettingsui/group"/>
</component>
</collection>
<collection id="simpleengine" name="SIMPLE Engine" level="engine">
- <component id="presencesettingsapi" filter="s60" name="Presence Settings API">
- <!-- <unit bldFile="simpleengine/presencesettingsapi/group"/> -->
- </component>
- <component id="siputils" filter="s60" name="SIP Utils">
- <!-- <unit bldFile="simpleengine/siputils/group"/> -->
- </component>
- <component id="xmlutils" filter="s60" name="XML Utils">
- <!-- <unit bldFile="simpleengine/xmlutils/group"/> -->
- </component>
- <component id="simpleengine_engine" filter="s60" name="Engine">
- <!-- <unit bldFile="simpleengine/engine/group"/> -->
- </component>
- <component id="xdmrlspres" filter="s60" name="RLS and Presence XDM">
- <!-- <unit bldFile="simpleengine/xdmrlspres/group"/> -->
- </component>
- <component id="presencedm" filter="s60" name="Presence DM Adapter" class="plugin">
- <!-- <unit bldFile="simpleengine/presencedm/group"/> -->
- </component>
- <component id="presenceprovisioning" filter="s60" name="Presence Provisioning" class="plugin">
- <!-- <unit bldFile="simpleengine/presenceprovisioning/group"/> -->
- </component>
+ <!-- collection is really a component. Need to move down a directory-->
<component id="simpleengine_build" filter="s60" name="SIMPLE Engine Build">
- <!-- should move the necesary parts into the above components, or collapse them all into one -->
<unit bldFile="simpleengine/group"/>
</component>
</collection>
- <collection id="xdmprotocols" name="XDM Protocols" level="fw">
- <component id="xdmxmlparser" filter="s60" name="XDM XML Parser">
- <!-- <unit bldFile="xdmprotocols/xdmxmlparser/group"/> -->
- </component>
- <component id="xcapprotocol" filter="s60" name="Xcap Protocol">
- <!-- <unit bldFile="xdmprotocols/xcapprotocol/group"/> -->
- <!-- <unit bldFile="xdmprotocols/xcapprotocol/xcapappusage/group"/> -->
- <!-- <unit bldFile="xdmprotocols/xcapprotocol/xcapcache/client/group"/> -->
- <!-- <unit bldFile="xdmprotocols/xcapprotocol/xcapcache/server/group"/> -->
- <!-- <unit bldFile="xdmprotocols/xcapprotocol/xcaphttptransport/group"/> -->
- <!-- <unit bldFile="xdmprotocols/xcapprotocol/xcapoperations/group"/> -->
- <!-- <unit bldFile="xdmprotocols/xcapprotocol/xcaputils/group"/> -->
- </component>
- <component id="localprotocol" filter="s60" name="Local Protocol">
- <!-- <unit bldFile="xdmprotocols/localprotocol/group"/> -->
- <!-- <unit bldFile="xdmprotocols/localprotocol/localoperations/group"/> -->
- </component>
- <component id="xdmprotocols_build" filter="s60" name="XDM Protocols Build">
- <!-- should move the necesary parts into the above components, or collapse them all into one -->
- <unit bldFile="xdmprotocols/group"/>
+ <collection id="presencefwsimpleadpt" name="Presence Framework SIMPLE Adaptation" level="fw">
+ <!-- collection is really a component. Need to move down a directory-->
+ <component id="simpleplugin" filter="s60" class="plugin" name="SIMPLE Plugin">
+ <unit bldFile="presencefwsimpleadpt/group"/>
</component>
</collection>
<collection id="simpledatamodeladapter" name="SIMPLE Data Model Adapter" level="fw">
--- a/symbian3/mw/locationsrv/package_definition_3.0.xml Wed Feb 03 19:36:09 2010 +0000
+++ b/symbian3/mw/locationsrv/package_definition_3.0.xml Wed Feb 03 20:06:22 2010 +0000
@@ -1,21 +1,32 @@
<?xml version="1.0" encoding="UTF-8"?>
<SystemDefinition schema="3.0.0">
<package id="locationsrv" name="Location Services" levels="plugin fw server if">
+ <collection id="genericpositioningplugins" name="Generic Positioning Plugins" level="plugin">
+ <component id="locationnpppsy" filter="s60" name="Location Positioning Proxy PSY" class="plugin">
+ <unit bldFile="genericpositioningplugins/locationnpppsy/group"/>
+ </component>
+ <component id="locationsuplpsy" filter="s60" name="Location SUPL PSY" class="plugin" introduced="^3">
+ <unit bldFile="genericpositioningplugins/locationsuplpsy/group"/>
+ </component>
+ <component id="genericpositioningplugins_build" filter="s60" name="Generic Positioning Plugins Build">
+ <!-- need to break this up into the other components -->
+ <unit bldFile="genericpositioningplugins/group"/>
+ </component>
+ </collection>
<collection id="landmarks" name="Landmarks" level="server">
<component id="locationlandmarks" filter="s60" name="Location Landmarks">
<unit bldFile="landmarks/locationlandmarks/group"/>
</component>
</collection>
<collection id="locationmapnavfw" name="Location Map and Navigation Framework" level="fw">
- <component id="library" filter="s60" name="Map and Navigation Library">
- <!-- should change ID to something more meaningful (mplibrary?) -->
+ <component id="mnlibrary" filter="s60" name="Map and Navigation Library">
<unit bldFile="locationmapnavfw/library/group"/>
</component>
- <component id="aiwprovider" filter="s60" name="Map and Navigation AIW Provider">
- <!-- should change ID to something more meaningful (mpaiwprovider?) -->
+ <component id="mnaiwprovider" filter="s60" name="Map and Navigation AIW Provider" class="plugin">
<unit bldFile="locationmapnavfw/aiwprovider/group"/>
</component>
<component id="locationmapnavfw_build" filter="s60" name="Location Map and Navigation Framework Build">
+ <!-- need to break this up into the other components -->
<unit bldFile="locationmapnavfw/group"/>
</component>
</collection>
@@ -31,8 +42,8 @@
<component id="locationomasuplprotocolhandler" filter="s60" name="OMA SUPL Protocol Handler">
<unit bldFile="supl/locationomasuplprotocolhandler/group"/>
</component>
- <component id="locationomasuplpostester" filter="s60" name="OMA SUPL POS Tester">
- <unit bldFile="supl/locationomasuplpostester/group"/>
+ <component id="supltiapiimplementation" filter="s60" name="SUPL TI API Implementation" introduced="^3">
+ <unit bldFile="supl/supltiapiimplementation/group"/>
</component>
</collection>
<collection id="locationtriggering" name="Location Triggering" level="server">
@@ -66,79 +77,20 @@
<component id="lbtmgmtui" filter="s60" name="LBT Management UI" class="plugin">
<unit bldFile="locationtriggering/lbtmgmtui/group"/>
</component>
- <component id="locationtriggering_test" filter="s60" name="Location Triggering Test" purpose="development">
- <!-- should have only one unit -->
- <!-- <unit bldFile="locationtriggering/tsrc/lbtengine_test/lbtcancellationtest/cancelcreatetest/group"/> -->
- <!-- <unit bldFile="locationtriggering/tsrc/lbtengine_test/additionaltests/createtest/group"/> -->
- <!-- <unit bldFile="locationtriggering/tsrc/lbtengine_test/additionaltests/handlingprocesstest/group"/> -->
- <!-- <unit bldFile="locationtriggering/tsrc/lbtengine_test/lbtplatsectest/testlbtplatsecurity2_exe/group"/> -->
- <!-- <unit bldFile="locationtriggering/tsrc/lbtengine_test/lbtcancellationtest/cancellisttriggerstest/group"/> -->
- <!-- <unit bldFile="locationtriggering/tsrc/lbtengine_test/lbtcancellationtest/cancelcreateiteratortest/group"/> -->
- <!-- <unit bldFile="locationtriggering/tsrc/lbtengine_test/lbtplatsectest/testlbtplatsecurity3_exe/group"/> -->
- <!-- <unit bldFile="locationtriggering/tsrc/lbtengine_test/firingofstartuptriggerandlisttrigger/createtest/group"/> -->
- <!-- <unit bldFile="locationtriggering/tsrc/lbtengine_test/t_mgmtsettings/group"/> -->
- <!-- <unit bldFile="locationtriggering/tsrc/lbtengine_test/lbtplatsectest/testlbtplatsecurity4_exe/group"/> -->
- <!-- <unit bldFile="locationtriggering/tsrc/lbtengine_test/lbtcancellationtest/cancelgettriggerstest/group"/> -->
- <!-- <unit bldFile="locationtriggering/tsrc/lbtengine_test/additionaltests/modifytest/group"/> -->
- <!-- <unit bldFile="locationtriggering/tsrc/lbtengine_test/t_mgmtsettings/createtest/group"/> -->
- <!-- <unit bldFile="locationtriggering/tsrc/lbtengine_test/group"/> -->
- <!-- <unit bldFile="locationtriggering/tsrc/lbtengine_test/lbtplatsectest/testlbtplatsecurity5_exe/group"/> -->
- <!-- <unit bldFile="locationtriggering/tsrc/lbtengine_test/additionaltests/notificationtest/group"/> -->
- <!-- <unit bldFile="locationtriggering/tsrc/lbtengine_test/lbtcancellationtest/cancelsettriggerstest/group"/> -->
- <!-- <unit bldFile="locationtriggering/tsrc/lbtengine_test/lbtcancellationtest/canceldeletetest/group"/> -->
- <!-- <unit bldFile="locationtriggering/tsrc/lbtengine_test/additionaltests/deletetest/group"/> -->
- <!-- <unit bldFile="locationtriggering/tsrc/lbtengine_test/lbtplatsectest/testlbtplatsecurity1_exe/group"/> -->
+ <component id="ltcontextsourceplugin" filter="s60" name="LT Context Source Plugin" class="plugin" introduced="^3">
+ <unit bldFile="locationtriggering/ltcontextsourceplugin/group"/>
</component>
<component id="locationtriggering_build" filter="s60" name="Location Triggering Build">
<!-- should remove #include from this and maybe put exports in the above components -->
<unit bldFile="locationtriggering/group"/>
</component>
</collection>
- <collection id="genericpositioningplugins" name="Generic Positioning Plugins" level="plugin">
- <component id="genericpositioningplugins_build" filter="s60" name="Generic Positioning Plugins Build">
- <unit bldFile="genericpositioningplugins/group"/>
- </component>
- <component id="locationnpppsy" filter="s60" name="Location Positioning Proxy PSY" class="plugin">
- <unit bldFile="genericpositioningplugins/locationnpppsy/group"/>
- </component>
- </collection>
<collection id="locationsrv_info" name="Location Services Info" level="if">
<component id="locsrv_plat" filter="s60" class="api" name="Location Services Platform Interfaces">
<unit bldFile="locsrv_plat/group"/>
- <!-- can only have one unit, should below be #included in the above? -->
- <!-- <unit bldFile="locsrv_plat/geocoding_api/tsrc/group"/> -->
- <!-- <unit bldFile="locsrv_plat/geocoding_api/tsrc/mapnavproviderrefapp/group"/> -->
- <!-- <unit bldFile="locsrv_plat/location_centre_api/tsrc/group"/> -->
- <!-- <unit bldFile="locsrv_plat/location_settings_launch_api/tsrc/group"/> -->
- <!-- <unit bldFile="locsrv_plat/map_and_navigation_api/tsrc/group"/> -->
- <!-- <unit bldFile="locsrv_plat/map_and_navigation_api/tsrc/mapnavproviderrefapp/group"/> -->
- <!-- <unit bldFile="locsrv_plat/map_and_navigation_provider_discovery_api/tsrc/group"/> -->
- <!-- <unit bldFile="locsrv_plat/map_and_navigation_provider_discovery_api/tsrc/mapnavproviderrefapp/group"/> -->
- <!-- <unit bldFile="locsrv_plat/map_image_api/tsrc/group"/> -->
- <!-- <unit bldFile="locsrv_plat/map_image_api/tsrc/testprovider/group"/> -->
- <!-- <unit bldFile="locsrv_plat/map_image_conversion_plugin_api/tsrc/group"/> -->
- <!-- <unit bldFile="locsrv_plat/map_image_conversion_plugin_api/tsrc/mapnavproviderrefapp/group"/> -->
- <!-- <unit bldFile="locsrv_plat/oma_supl_asn_codec_plugin_api/tsrc/group"/> -->
- <!-- <unit bldFile="locsrv_plat/supl_network_initiation_api/tsrc/group"/> -->
- <!-- <unit bldFile="locsrv_plat/supl_pos_message_plugin_api/tsrc/group"/> -->
- <!-- <unit bldFile="locsrv_plat/supl_pos_message_plugin_api/tsrc/posmsgpluginreferenceimpl/group"/> -->
- <!-- <unit bldFile="locsrv_plat/supl_settings_api/tsrc/group"/> -->
- <!-- <unit bldFile="locsrv_plat/supl_terminal_initiation_api/tsrc/group"/> -->
- </component>
- <component id="locationsrv_test" filter="s60" name="Location Services Test" purpose="development">
- <!-- <unit bldFile="tsrc/group"/> -->
</component>
<component id="locsrv_pub" filter="s60" class="api" name="Location Services Public Interfaces">
<unit bldFile="locsrv_pub/group"/>
- <!-- can only have one unit, should below be #included in the above? -->
- <!-- <unit bldFile="locsrv_pub/blid_application_satellite_info_api/tsrc/bc_blid_application_satellite_info_api/group"/> -->
- <!-- <unit bldFile="locsrv_pub/blid_application_satellite_info_api/tsrc/ut_csatelliteuitest/group"/> -->
- <!-- <unit bldFile="locsrv_pub/landmarks_api/tsrc/bc_landmarks_api/group"/> -->
- <!-- <unit bldFile="locsrv_pub/landmarks_api/tsrc/group"/> -->
- <!-- <unit bldFile="locsrv_pub/landmarks_database_management_api/tsrc/bc_landmarks_database_management_api/group"/> -->
- <!-- <unit bldFile="locsrv_pub/landmarks_database_management_api/tsrc/group"/> -->
- <!-- <unit bldFile="locsrv_pub/landmarks_search_api/tsrc/bc_landmarks_search_api/group"/> -->
- <!-- <unit bldFile="locsrv_pub/landmarks_search_api/tsrc/group"/> -->
</component>
</collection>
</package>
--- a/symbian3/mw/mds/package_definition_3.0.xml Wed Feb 03 19:36:09 2010 +0000
+++ b/symbian3/mw/mds/package_definition_3.0.xml Wed Feb 03 20:06:22 2010 +0000
@@ -1,9 +1,34 @@
<?xml version="1.0" encoding="UTF-8"?>
<SystemDefinition schema="3.0.0">
<package id="mds" name="Metadata Services" levels="mgr eng server int">
- <collection id="clfwrapper" name="Content Listing Framework Wrapper" level="int">
- <component id="clfwrapper_build" filter="s60" name="CLF Wrapper Build" introduced="^2">
- <unit bldFile="clfwrapper/group"/>
+ <collection id="metadataengine" name="Metadata Engine" level="eng">
+ <component id="metadataengine_common" filter="s60" name="Metadata Engine Common" introduced="^2">
+ <unit bldFile="metadataengine/common/group"/>
+ </component>
+ <component id="metadataengine_server" filter="s60" name="Metadata Engine Server" introduced="^2">
+ <unit bldFile="metadataengine/server/group"/>
+ </component>
+ <component id="metadataengine_client" filter="s60" name="Metadata Engine Client" introduced="^2">
+ <unit bldFile="metadataengine/client/group"/>
+ </component>
+ <component id="metadataengine_build" filter="s60" name="Metadata Engine Build" introduced="^2">
+ <!--make this collection a single component, or split this bld.inf into the other units -->
+ <unit bldFile="metadataengine/group"/>
+ </component>
+ </collection>
+ <collection id="locationmanager" name="Location Manager" level="mgr">
+ <component id="locationtrail" filter="s60" name="Location Trail" introduced="^2">
+ <unit bldFile="locationmanager/locationtrail/group"/>
+ </component>
+ <component id="locationmanager_server" filter="s60" name="Location Manager Server" introduced="^2">
+ <unit bldFile="locationmanager/server/group"/>
+ </component>
+ <component id="locationmanager_client" filter="s60" name="Location Manager Client" introduced="^2">
+ <unit bldFile="locationmanager/client/group"/>
+ </component>
+ <component id="locationmanager_build" filter="s60" name="Location Manager Build" introduced="^2">
+ <!--make this collection a single component, or split this bld.inf into the other units -->
+ <unit bldFile="locationmanager/group"/>
</component>
</collection>
<collection id="contextengine" name="Context Engine" level="eng">
@@ -11,6 +36,7 @@
<unit bldFile="contextengine/plugins/group"/>
</component>
<component id="contextengine_build" filter="s60" name="Context Engine Build" introduced="^2">
+ <!--make this collection a single component, or make this unit self-contained -->
<unit bldFile="contextengine/group"/>
</component>
</collection>
@@ -28,7 +54,6 @@
<unit bldFile="harvester/composerplugins/group"/>
</component>
<component id="harvesterplugins" filter="s60" name="Harvester Plugins" class="plugin" introduced="^2">
- <!-- <unit bldFile="harvester/harvesterplugins/audioplaylistplugin/group"/> -->
<unit bldFile="harvester/harvesterplugins/group"/>
</component>
<component id="monitorplugins" filter="s60" name="Monitor Plugins" class="plugin" introduced="^2">
@@ -41,47 +66,23 @@
<unit bldFile="harvester/client/group"/>
</component>
<component id="harvester_build" filter="s60" name="Harvester Build" introduced="^2">
+ <!-- split these exports into the other components -->
<unit bldFile="harvester/group"/>
</component>
</collection>
- <collection id="locationmanager" name="Location Manager" level="mgr">
- <component id="locationtrail" filter="s60" name="Location Trail" introduced="^2">
- <unit bldFile="locationmanager/locationtrail/group"/>
- </component>
- <component id="locationmanager_server" filter="s60" name="Location Manager Server" introduced="^2">
- <unit bldFile="locationmanager/server/group"/>
- </component>
- <component id="locationmanager_client" filter="s60" name="Location Manager Client" introduced="^2">
- <unit bldFile="locationmanager/client/group"/>
- </component>
- <component id="locationmanager_build" filter="s60" name="Location Manager Build" introduced="^2">
- <!--consider making this collection a single component -->
- <unit bldFile="locationmanager/group"/>
- </component>
- </collection>
- <collection id="metadataengine" name="Metadata Engine" level="eng">
- <component id="metadataengine_common" filter="s60" name="Metadata Engine Common" introduced="^2">
- <unit bldFile="metadataengine/common/group"/>
- </component>
- <component id="metadataengine_server" filter="s60" name="Metadata Engine Server" introduced="^2">
- <unit bldFile="metadataengine/server/group"/>
- </component>
- <component id="metadataengine_client" filter="s60" name="Metadata Engine Client" introduced="^2">
- <unit bldFile="metadataengine/client/group"/>
- </component>
- <component id="metadataengine_build" filter="s60" name="Metadata Engine Build" introduced="^2">
- <!--consider making this collection a single component -->
- <unit bldFile="metadataengine/group"/>
- </component>
- </collection>
<collection id="watchdog" name="Watchdog" level="server">
+ <!-- collection is really a component. Move down a directory -->
<component id="mdswatchdog" filter="s60" name="Metadata Watchdog" introduced="^2">
<unit bldFile="watchdog/group"/>
</component>
</collection>
- <collection id="iadstoprestart" name="IAD Stop/Restart" level="server">
- <component id="iadstoprestart_build" filter="s60" name="IAD Stop Restart Build" introduced="^2">
- <!-- <unit bldFile="iadstoprestart/group"/> -->
+ <collection id="clfwrapper" name="Content Listing Framework Wrapper" level="int">
+ <meta rel="config">
+ <defined condition="RD_MDS_2_5"/>
+ </meta>
+ <!-- collection is really a component. Move down a directory -->
+ <component id="clfwrapper_build" filter="s60" name="CLF Wrapper Build" introduced="^2">
+ <unit bldFile="clfwrapper/group"/>
</component>
</collection>
<collection id="mds_info" name="Metadata Services Info" level="int">
@@ -90,17 +91,19 @@
</component>
<component id="mds_plat" filter="s60" name="Metadata Services Platform Interfaces" class="api" introduced="^2">
<unit bldFile="mds_plat/group"/>
- <!-- should #include the rets if they're needed -->
- <!-- <unit bldFile="mds_plat/content_listing_framework_collection_manager_api/tsrc/group"/> -->
- <!-- <unit bldFile="mds_plat/context_engine_plugin_api/tsrc/group"/> -->
- <!-- <unit bldFile="mds_plat/harvester_framework_api/tsrc/composerplugintest/group"/> -->
- <!-- <unit bldFile="mds_plat/harvester_framework_api/tsrc/group"/> -->
- <!-- <unit bldFile="mds_plat/harvester_framework_api/tsrc/harvesterclienttest/group"/> -->
- <!-- <unit bldFile="mds_plat/harvester_framework_api/tsrc/harvesterdatatest/group"/> -->
- <!-- <unit bldFile="mds_plat/harvester_framework_api/tsrc/harvesterplugintest/group"/> -->
- <!-- <unit bldFile="mds_plat/harvester_framework_api/tsrc/monitorplugintest/group"/> -->
- <!-- <unit bldFile="mds_plat/location_manager_api/tsrc/group"/> -->
- <!-- <unit bldFile="mds_plat/metadata_engine_api/tsrc/group"/> -->
+ </component>
+ <component id="mds_api_tests" filter="s60,api_test" name="Metadata Services API Tests" purpose="development" introduced="^2">
+ <unit bldFile="mds_plat/content_listing_framework_collection_manager_api/tsrc/group"/>
+ <unit bldFile="mds_plat/context_engine_plugin_api/tsrc/group"/>
+ <unit bldFile="mds_plat/harvester_framework_api/tsrc/composerplugintest/group"/>
+ <unit bldFile="mds_plat/harvester_framework_api/tsrc/group"/>
+ <unit bldFile="mds_plat/harvester_framework_api/tsrc/harvesterclienttest/group"/>
+ <unit bldFile="mds_plat/harvester_framework_api/tsrc/harvesterdatatest/group"/>
+ <unit bldFile="mds_plat/harvester_framework_api/tsrc/harvesterplugintest/group"/>
+ <unit bldFile="mds_plat/harvester_framework_api/tsrc/monitorplugintest/group"/>
+ <unit bldFile="mds_plat/location_manager_api/tsrc/group"/>
+ <unit bldFile="mds_plat/metadata_engine_api/tsrc/group"/>
+ <unit bldFile="mds_pub/content_listing_framework_api/tsrc/group"/>
</component>
<component id="mds_build" filter="s60" name="Metadata Services Build" introduced="^2">
<!-- consider distributiing this into the rest of the components in the package -->
--- a/symbian3/mw/messagingmw/package_definition_3.0.xml Wed Feb 03 19:36:09 2010 +0000
+++ b/symbian3/mw/messagingmw/package_definition_3.0.xml Wed Feb 03 20:06:22 2010 +0000
@@ -2,14 +2,14 @@
<SystemDefinition schema="3.0.0">
<package id="messagingmw" name="Messaging Middleware" levels="stack fw api">
<collection id="msgbranched" name="Messaging Branched" level="fw">
+ <!-- collection is really a component. Need to move down a directory -->
<component id="msgbranched_build" filter="s60" name="Messaging Branched Build">
<unit bldFile="msgbranched/group"/>
</component>
</collection>
<collection id="messagingfw" name="Messaging Framework" level="fw">
+ <!-- should break this collection up into smaller related collections -->
<component id="alwaysonline" filter="s60" name="Always Online Server" introduced="^2">
- <!-- <unit bldFile="messagingfw/alwaysonline/alwaysonlinemanager/group"/> -->
- <!-- <unit bldFile="messagingfw/alwaysonline/alwaysonlinestarterapp/group"/> -->
<unit bldFile="messagingfw/alwaysonline/group"/>
</component>
<component id="msgcommonutils" filter="s60" name="Messaging Common Utils" introduced="^2">
@@ -17,10 +17,6 @@
</component>
<component id="senduiservices" filter="s60" name="Send UI Services" introduced="^2">
<unit bldFile="messagingfw/senduiservices/group"/>
- <!-- <unit bldFile="messagingfw/senduiservices/datautils/group"/> -->
- <!-- <unit bldFile="messagingfw/senduiservices/launcher/group"/> -->
- <!-- <unit bldFile="messagingfw/senduiservices/serviceresolver/group"/> -->
- <!-- <unit bldFile="messagingfw/senduiservices/watcher/group"/> -->
</component>
<component id="scheduledsendmtm" name="Scheduled Send MTM" introduced="6.0" purpose="optional" class="plugin">
<unit bldFile="messagingfw/scheduledsendmtm/group" mrp="messagingfw/scheduledsendmtm/group/messaging_schedulesend.mrp"/>
@@ -66,14 +62,11 @@
</component>
</collection>
<collection id="messagingmw_info" name="Messaging Middleware Info" level="api">
+ <component id="msgfw_plat" filter="s60" name="Messaging Middleware Platform Interfaces" class="api">
+ <unit bldFile="msgfw_plat/group"/>
+ </component>
<component id="msgfw_pub" filter="s60" name="Messaging Middleware Public Interfaces" class="api">
<unit bldFile="msgfw_pub/group"/>
- <!-- <unit bldFile="msgfw_pub/send_ui_api/tsrc/bc/group"/> -->
- <unit bldFile="msgfw_pub/send_ui_api/tsrc/group"/>
- </component>
- <component id="msgfw_plat" filter="s60" name="Messaging Middleware Platform Interfaces" class="api">
- <unit bldFile="msgfw_plat/group"/>
- <unit bldFile="msgfw_plat/send_ui_plugin_api/tsrc/group"/>
</component>
<component id="messagingmw_metadata" name="Messaging Middleware Metadata" class="config" introduced="^2" purpose="development" target="desktop">
<unit mrp="messagingmw_info/messagingmw_metadata/messagingmw_metadata.mrp"/>
--- a/symbian3/mw/metadatasrv/package_definition_3.0.xml Wed Feb 03 19:36:09 2010 +0000
+++ b/symbian3/mw/metadatasrv/package_definition_3.0.xml Wed Feb 03 20:06:22 2010 +0000
@@ -1,16 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<SystemDefinition schema="3.0.0">
<package id="metadatasrv" name="Legacy Metadata Services" levels="plugin framework server generic specific">
- <collection id="contentlistingframework" name="Content Listing Framework" level="framework">
- <component id="contentlistingframework_build" filter="s60" name="Content Listing Framework Build">
- <unit bldFile="contentlistingframework/group"/>
- </component>
- </collection>
- <collection id="mediamanagementuis" name="Media Management UIs" level="server">
- <component id="mediastylegrid" filter="s60" name="Media Style Grid">
- <unit bldFile="mediamanagementuis/mediastylegrid/group"/>
- </component>
- </collection>
<collection id="mediamanagementutilities" name="Media Management Utilities" level="generic">
<component id="mediafetch" filter="s60" name="Media Fetch">
<unit bldFile="mediamanagementutilities/mediafetch/group"/>
@@ -20,10 +10,6 @@
<component id="metadatasrv_plat" filter="s60" name="Legacy Metadata Services Platform Interfaces" class="api">
<unit bldFile="metadatasrv_plat/group"/>
</component>
- <component id="metadatasrv_build" filter="s60" name="Legacy Metadata Services Build">
- <!-- this is likely not still needed -->
- <unit bldFile="group"/>
- </component>
<component id="metadatasrv_pub" filter="s60" name="Legacy Metadata Services Public Interfaces" class="api">
<unit bldFile="metadatasrv_pub/group"/>
</component>
--- a/symbian3/mw/mmappfw/package_definition_3.0.xml Wed Feb 03 19:36:09 2010 +0000
+++ b/symbian3/mw/mmappfw/package_definition_3.0.xml Wed Feb 03 20:06:22 2010 +0000
@@ -1,7 +1,30 @@
<?xml version="1.0" encoding="UTF-8"?>
<SystemDefinition schema="3.0.0">
<package id="mmappfw" name="Multimedia App Framework" levels="fw utils if">
+ <collection id="mpx" name="Multimedia Player" level="fw">
+ <component id="commonframework" filter="s60" name="MPX Common Framework" introduced="^1">
+ <unit bldFile="mpx/commonframework/group"/>
+ </component>
+ <component id="playbackframework" filter="s60" name="MPX Playback Framework" introduced="^1">
+ <unit bldFile="mpx/playbackframework/group"/>
+ </component>
+ <component id="mpxcollectionfw" filter="s60" name="MPX Collection Framework" introduced="^1">
+ <unit bldFile="mpx/collectionframework/group"/>
+ </component>
+ <component id="mpxviewfw" filter="s60" name="MPX View Framework" introduced="^1">
+ <unit bldFile="mpx/viewframework/group"/>
+ </component>
+ <component id="mpx_build" filter="s60" name="MPX Build" introduced="^1">
+ <!-- Move the export to another component or remove the #includes from this one -->
+ <unit bldFile="mpx/group"/>
+ </component>
+ </collection>
<collection id="mmappcomponents" name="Multimedia App Components" level="utils">
+ <component id="mmappcomponents_build" filter="s60" name="Multimedia App Components Build" introduced="^1">
+ <!-- needed for #ifdefs and hrh include. Need to #include the .hrh file in each bld.inf
+ Can remove this once configuration is in place-->
+ <unit bldFile="mmappcomponents/group"/>
+ </component>
<component id="collectionhelper" filter="s60" name="Media Player Collection Helper" introduced="^1">
<unit bldFile="mmappcomponents/collectionhelper/group"/>
</component>
@@ -18,57 +41,39 @@
<unit bldFile="mmappcomponents/mediaplayersettingsengine/group"/>
</component>
<component id="audiofetcher" filter="s60" name="Audio Fetcher" class="plugin" introduced="^1">
- <unit bldFile="mmappcomponents/audiofetcher/group"/>
+ <meta rel="config">
+ <defined condition="IAD_INCLUDE_AUDIOFETCHER"/>
+ </meta>
+ <!-- uncomment when config is in place, currently #included in mmappcomponents_build -->
+ <!-- <unit bldFile="mmappcomponents/audiofetcher/group"/>-->
</component>
<component id="asxparser" filter="s60" name="ASX Parser" introduced="^1">
- <unit bldFile="mmappcomponents/asxparser/group"/>
- <!-- does the test bld.inf need to be #included? -->
- <!-- <unit bldFile="mmappcomponents/asxparser/test"/> -->
- </component>
- </collection>
- <collection id="mpx" name="Multimedia Player" level="fw">
- <component id="commonframework" filter="s60" name="MPX Common Framework" introduced="^1">
- <unit bldFile="mpx/commonframework/group"/>
+ <meta rel="config">
+ <defined condition="__WINDOWS_MEDIA"/>
+ </meta>
+ <!-- uncomment when config is in place, currently #included in mmappcomponents_build -->
+ <!-- <unit bldFile="mmappcomponents/asxparser/group"/>-->
</component>
- <component id="playbackframework" filter="s60" name="MPX Playback Framework" introduced="^1">
- <unit bldFile="mpx/playbackframework/group"/>
- </component>
- <component id="mpxcollectionfw" filter="s60" name="MPX Collection Framework" introduced="^1">
- <unit bldFile="mpx/collectionframework/group"/>
+ <component id="playbackhelper" filter="s60" name="Playback Helper" introduced="^3">
+ <unit bldFile="mmappcomponents/playbackhelper/group"/>
</component>
- <component id="mpxviewfw" filter="s60" name="MPX View Framework" introduced="^1">
- <unit bldFile="mpx/viewframework/group"/>
+ <component id="videoplaylistutility" filter="s60" name="Video Playlist Utility" introduced="^3">
+ <unit bldFile="mmappcomponents/videoplaylistutility/group"/>
</component>
- <component id="mpx_build" filter="s60" name="MPX Build" introduced="^1">
- <!-- can the exports from here be distribtued to the above bld.infs? -->
- <unit bldFile="mpx/group"/>
+ <component id="mmmtpdataprovider" filter="s60" name="Multimedia MTP Data Provider" introduced="^3">
+ <unit bldFile="mmappcomponents/mmmtpdataprovider/group"/>
</component>
</collection>
<collection id="mmappfw_info" name="Multimedia App Framework Info" level="if">
<component id="mmappfw_build" filter="s60" name="Multimedia App Framework Build" introduced="^1">
- <!-- does the export from ehre really belong in one of the other components? -->
+ <!-- Move the export to another component or remove the #includes from this one -->
<unit bldFile="group"/>
</component>
- <component id="mmappfw_test" filter="s60" name="Multimedia App Framework Test" purpose="development" introduced="^1">
- <!-- should this component exist? -->
- <!-- <unit bldFile="tsrc/group"/> -->
+ <component id="mmappfw_test" filter="s60,api_test,pref_test" name="Multimedia App Framework Test" purpose="development" introduced="^1">
+ <unit bldFile="tsrc/group" filter="TA_MMAPPFW"/>
</component>
<component id="mmappfw_plat" filter="s60" name="Multimedia App Framework Platform Interfaces" class="api" introduced="^1">
- <!-- there can only be a single unit, these should be #included from a main bld.inf -->
<unit bldFile="mmappfw_plat/group"/>
- <unit bldFile="mmappfw_plat/asx_parser_api/tsrc/group"/>
- <unit bldFile="mmappfw_plat/collection_helper_api/tsrc/group"/>
- <unit bldFile="mmappfw_plat/harvester_collection_mediator_api/tsrc/group"/>
- <unit bldFile="mmappfw_plat/harvester_metadata_extractor_api/tsrc/group"/>
- <unit bldFile="mmappfw_plat/harvester_utility_api/tsrc/group"/>
- <unit bldFile="mmappfw_plat/media_player_settings_engine_api/tsrc/group"/>
- <unit bldFile="mmappfw_plat/mpx_albumart_utility_api/tsrc/group"/>
- <unit bldFile="mmappfw_plat/mpx_base_view_plugins_api/tsrc/group"/>
- <unit bldFile="mmappfw_plat/mpx_collection_utility_api/tsrc/group"/>
- <unit bldFile="mmappfw_plat/mpx_common_api/tsrc/group"/>
- <unit bldFile="mmappfw_plat/mpx_playback_utility_api/tsrc/group"/>
- <unit bldFile="mmappfw_plat/mpx_view_utility_api/tsrc/group"/>
- <unit bldFile="mmappfw_plat/playlist_engine_api/tsrc/group"/>
</component>
</collection>
</package>
--- a/symbian3/mw/mmmw/package_definition_3.0.xml Wed Feb 03 19:36:09 2010 +0000
+++ b/symbian3/mw/mmmw/package_definition_3.0.xml Wed Feb 03 20:06:22 2010 +0000
@@ -1,120 +1,68 @@
<?xml version="1.0" encoding="UTF-8"?>
<SystemDefinition schema="3.0.0">
<package id="mmmw" name="Multimedia Middleware" levels="plugin framework server generic specific">
- <collection id="radioutility" name="Radio Utility" level="generic">
- <component id="radioserver" filter="s60" name="Radio Server">
- <unit bldFile="radioutility/radioserver/group"/>
- <!-- <unit bldFile="radioutility/radioserver/server/group"/> -->
- <!-- <unit bldFile="radioutility/radioserver/session/group"/> -->
+ <collection id="mmfenh" name="MMF Enhancements" level="generic">
+ <component id="advancedaudiocontroller" filter="s60" name="Advanced Audio Controllers" class="plugin">
+ <unit bldFile="mmfenh/advancedaudiocontroller/group"/>
</component>
- <component id="radio_utility" filter="s60" name="Radio Utility">
- <unit bldFile="radioutility/radio_utility/group"/>
- </component>
- <component id="fmpresetutility" filter="s60" name="FM Preset Utility">
- <unit bldFile="radioutility/fmpresetutility/group"/>
- </component>
- <component id="radioutility_build" filter="s60" name="Radio Utility Build">
- <!-- should remove included bld.infs from here -->
- <unit bldFile="radioutility/group"/>
+ <component id="audiooutputcontrolutility" filter="s60" name="Audio Output Control Utility">
+ <unit bldFile="mmfenh/audiooutputcontrolutility/group"/>
</component>
- </collection>
- <collection id="audioeffectsui" name="Audio Effects UI" level="specific">
- <component id="equalizer" filter="s60" name="Equalizer">
- <unit bldFile="audioeffectsui/equalizer/group"/>
+ <component id="configurationcomponentsfactory" filter="s60" name="Configuration Components Factory">
+ <unit bldFile="mmfenh/configurationcomponentsfactory/group"/>
</component>
- </collection>
- <collection id="audioenhancements" name="Audio Enhancements" level="generic">
<component id="enhancedaudioplayerutility" filter="s60" name="Enhanced Audio Player Utility">
- <unit bldFile="audioenhancements/enhancedaudioplayerutility/group"/>
- <!-- should the rest of the bld.infs be #included? -->
- <!-- <unit bldFile="audioenhancements/enhancedaudioplayerutility/audioplayer/group"/> -->
- <!-- <unit bldFile="audioenhancements/enhancedaudioplayerutility/audiostreaming/group"/> -->
- <!-- <unit bldFile="audioenhancements/enhancedaudioplayerutility/s60audiosource/group"/> -->
- <!-- <unit bldFile="audioenhancements/enhancedaudioplayerutility/s60audiosourcefactory/group"/> -->
- <!-- <unit bldFile="audioenhancements/enhancedaudioplayerutility/s60audioutility/group"/> -->
+ <unit bldFile="mmfenh/enhancedaudioplayerutility/group"/>
+ </component>
+ <component id="enhancedmediaclient" filter="s60" name="Enhanced Media Client">
+ <unit bldFile="mmfenh/enhancedmediaclient/group"/>
+ </component>
+ <component id="profilesettingsmonitor" filter="s60" name="Profile Settings Monitor">
+ <unit bldFile="mmfenh/profilesettingsmonitor/group"/>
</component>
<component id="progressivedownload" filter="s60" name="Progressive Download">
- <unit bldFile="audioenhancements/progressivedownload/group"/>
- <!-- <unit bldFile="audioenhancements/progressivedownload/progressivedownloadsource/group"/> -->
- <!-- <unit bldFile="audioenhancements/progressivedownload/progressivedownloadutility/group"/> -->
- </component>
- <component id="enhancedmediaclient" filter="s60" name="Enhanced Media Client">
- <unit bldFile="audioenhancements/enhancedmediaclient/group"/>
+ <unit bldFile="mmfenh/progressivedownload/group"/>
</component>
- <component id="profilesettingsmonitor" filter="s60" name="Profile Settings Monitor">
- <unit bldFile="audioenhancements/profilesettingsmonitor/group"/>
- </component>
- <component id="voipaudioservices" filter="s60" name="VoIP Audio Services">
- <unit bldFile="audioenhancements/voipaudioservices/group"/>
- </component>
- <component id="configurationcomponentsfactory" filter="s60" name="Configuration Components Factory">
- <unit bldFile="audioenhancements/configurationcomponentsfactory/group"/>
- </component>
- <component id="audiooutputcontrolutility" filter="s60" name="Audio Output Control Utility">
- <unit bldFile="audioenhancements/audiooutputcontrolutility/group"/>
+ <component id="mmfenh_test" filter="s60,module_test,pref_test" name="MMF Enhancements Tests" purpose="development">
+ <unit bldFile="mmfenh/advancedaudiocontroller/tsrc/advancedaudiocontrollertestmodule/group"/>
+ </component>
+ </collection>
+ <collection id="mm_fw" name="Multimedia Frameworks" level="framework">
+ <!-- Id needs to be unique, mmfw already in use -->
+ <!-- Placeholder for OpenAX AL and other stuff -->
+ </collection>
+ <collection id="mmserv" name="Multimedia Services" level="specific">
+ <component id="audioeffectsui" filter="s60" name="Audio Effects UI">
+ <unit bldFile="mmserv/audioeffectsui/group"/>
</component>
<component id="callaudiocontrol" filter="s60" name="Call Audio Control">
- <unit bldFile="audioenhancements/callaudiocontrol/group"/>
+ <unit bldFile="mmserv/callaudiocontrol/group"/>
+ </component>
+ <component id="metadatautility" filter="s60" name="Metadata Utility">
+ <unit bldFile="mmserv/metadatautility/group"/>
</component>
- </collection>
- <collection id="metadatautility" name="Metadata Utility" level="generic">
- <component id="extparserlib3gp_stub" filter="s60" name="3GP Extension Parser Library">
- <unit bldFile="metadatautility/3gpextparserlib_stub/group"/>
+ <component id="radioutility" filter="s60" name="Radio Utility">
+ <unit bldFile="mmserv/radioutility/group"/>
</component>
- <component id="metadatautility_build" filter="s60" name="Metadata Utility Build">
- <unit bldFile="metadatautility/group"/>
+ <component id="thumbnailengine" filter="s60" name="Thumbnail Engine" introduced="^2">
+ <unit bldFile="mmserv/thumbnailengine/group"/>
</component>
- </collection>
- <collection id="advancedaudiocontroller" name="Advanced Audio Controller" level="plugin">
- <component id="audiocontrollerpluginsvariant" filter="s60" name="Audio Controller Plugins Variant" class="plugin">
- <unit bldFile="advancedaudiocontroller/audiocontrollerpluginsvariant/group"/>
- <!-- do the rest of these need to be #included? -->
- <!-- <unit bldFile="advancedaudiocontroller/audiocontrollerpluginsvariant/3gpaudioplaycontroller/group"/> -->
- <!-- <unit bldFile="advancedaudiocontroller/audiocontrollerpluginsvariant/3gpaudiorecordcontroller/group"/> -->
- <!-- <unit bldFile="advancedaudiocontroller/audiocontrollerpluginsvariant/3gpdatasourceadapter/group"/> -->
- <!-- <unit bldFile="advancedaudiocontroller/audiocontrollerpluginsvariant/aacaudioplaycontroller/group"/> -->
- <!-- <unit bldFile="advancedaudiocontroller/audiocontrollerpluginsvariant/advancedaudiocontroller/group"/> -->
- <!-- <unit bldFile="advancedaudiocontroller/audiocontrollerpluginsvariant/advancedaudiocontrollerutility/group"/> -->
- <!-- <unit bldFile="advancedaudiocontroller/audiocontrollerpluginsvariant/amraudioplaycontroller/group"/> -->
- <!-- <unit bldFile="advancedaudiocontroller/audiocontrollerpluginsvariant/amraudiorecordcontroller/group"/> -->
- <!-- <unit bldFile="advancedaudiocontroller/audiocontrollerpluginsvariant/awbaudioplaycontroller/group"/> -->
- <!-- <unit bldFile="advancedaudiocontroller/audiocontrollerpluginsvariant/datasourceadapter/group"/> -->
- <!-- <unit bldFile="advancedaudiocontroller/audiocontrollerpluginsvariant/devsoundaudioinput/group"/> -->
- <!-- <unit bldFile="advancedaudiocontroller/audiocontrollerpluginsvariant/devsoundaudiooutput/group"/> -->
- <!-- <unit bldFile="advancedaudiocontroller/audiocontrollerpluginsvariant/fileaudiooutput/group"/> -->
- <!-- <unit bldFile="advancedaudiocontroller/audiocontrollerpluginsvariant/hxaudiorecognizer/group"/> -->
- <!-- <unit bldFile="advancedaudiocontroller/audiocontrollerpluginsvariant/metadatawrite/group"/> -->
- <!-- <unit bldFile="advancedaudiocontroller/audiocontrollerpluginsvariant/mp3audioplaycontroller/group"/> -->
+ <component id="tms" filter="s60" name="Telephony Multimedia Service" introduced="^3">
+ <unit bldFile="mmserv/tms/group"/>
+ </component>
+ <component id="voipaudioservices" filter="s60" name="VoIP Audio Services">
+ <unit bldFile="mmserv/voipaudioservices/group"/>
</component>
- <component id="wavplaycontrollerplugin" filter="s60" name="WAV Play Controller Plugin" class="plugin">
- <unit bldFile="advancedaudiocontroller/wavplaycontrollerplugin/group"/>
- </component>
- <component id="advancedaudiocontroller_test" filter="s60" name="Advanced Audio Controller Test" purpose="development">
- <!-- <unit bldFile="advancedaudiocontroller/tsrc/advancedaudiocontrollertestmodule/group"/> -->
+ </collection>
+ <collection id="mmmw_info" name="Multimedia Middleware Info" level="specific">
+ <component id="mmmw_test" filter="s60,api_test,pref_test" name="Multimedia Middleware Tests" purpose="development">
+ <unit bldFile="tsrc/group"/>
</component>
- </collection>
- <collection id="thumbnailengine" name="Thumbnail Engine" level="server">
- <component id="tneengine" filter="s60" name="Thumbnail Engine Build" introduced="^2">
- <unit bldFile="thumbnailengine/group"/>
- </component>
- </collection>
- <collection id="mm_fw" name="Multimedia Framework" level="framework">
- <component id="helix_stub" filter="s60" name="Helix Stub" introduced="^2">
- <unit bldFile="mmfw/helix_stub/group"/>
- </component>
- </collection>
- <collection id="mmmw_info" name="Multimedia Middleware Info" level="specific">
- <component id="mmmw_test" filter="s60" name="Multimedia Middleware Test" purpose="development">
- <!-- <unit bldFile="tsrc/group"/> -->
+ <component id="mmmw_api_test" filter="s60,api_test" name="Multimedia Middleware API Tests" purpose="development">
+ <unit bldFile="mmmw_plat/telephony_multimedia_service_api/tsrc/group"/>
</component>
<component id="mmmw_plat" filter="s60" name="Multimedia Middleware Platform Interfaces" class="api">
- <unit bldFile="mmmw_plat/audio_metadata_reader_api/tsrc/group"/>
- <unit bldFile="mmmw_plat/audio_output_control_utility_api/tsrc/group"/>
- <unit bldFile="mmmw_plat/call_audio_control_api/tsrc/group"/>
- <unit bldFile="mmmw_plat/enhanced_media_client_api/tsrc/group"/>
<unit bldFile="mmmw_plat/group"/>
- <unit bldFile="mmmw_plat/radio_utilities_api/tsrc/group"/>
- <unit bldFile="mmmw_plat/voip_audio_services_api/tsrc/group"/>
</component>
<component id="mmmw_metadata" name="Multimedia Middleware Metadata" class="config" introduced="^2" purpose="development" target="desktop">
<unit mrp="mmmw_info/mmmw_metadata/mmmw_metadata.mrp"/>
--- a/symbian3/mw/mmuifw/package_definition_3.0.xml Wed Feb 03 19:36:09 2010 +0000
+++ b/symbian3/mw/mmuifw/package_definition_3.0.xml Wed Feb 03 20:06:22 2010 +0000
@@ -6,34 +6,31 @@
<unit bldFile="mmuifw_plat/group"/>
</component>
<component id="mmuifw_build" filter="s60" name="Multimedia UI Framework Build">
+ <!-- Move exports into other componetns or remove all #includes and make this a ROM component -->
<unit bldFile="group"/>
- <!-- can this be distributed into the other components? -->
</component>
</collection>
<collection id="osncore" name="OS Neutral Library Core" level="util">
+ <!-- collection is really a component. Move down a directory -->
<component id="osncore_build" filter="s60" name="OSN Core Build">
<unit bldFile="osncore/group"/>
</component>
</collection>
<collection id="alfwidgetutils" name="Accelerated LAF Widget Utils" level="ui">
+ <!-- collection is really a component. Move down a directory -->
<component id="alfwidgetutils_build" filter="s60" name="ALF Widget Utils">
<unit bldFile="alfwidgetutils/group"/>
</component>
</collection>
<collection id="resourcepool" name="Resource Pool" level="util">
+ <!-- collection is really a component. Move down a directory -->
<component id="alfresourcepool" filter="s60" name="ALF Resource Pool">
<unit bldFile="resourcepool/group"/>
</component>
</collection>
<collection id="widgetmodel" name="Widget Model" level="mdl">
- <component id="alfwidgetmodel" filter="s60" name="ALF Widget Model">
- <!-- <unit bldFile="widgetmodel/alfwidgetmodel/group"/> -->
- </component>
- <component id="alfwidgetfactory" filter="s60" name="ALF Widget Factory">
- <!-- <unit bldFile="widgetmodel/alfwidgetfactory/group"/> -->
- </component>
+ <!-- collection is really a component. Move down a directory -->
<component id="widgetmodel_build" filter="s60" name="Widget Model Build">
- <!-- eitehr split this into the other 2 components or collapse them all into this one -->
<unit bldFile="widgetmodel/group"/>
</component>
</collection>
@@ -45,13 +42,13 @@
<component id="muldatamodel" filter="s60" name="MUL Data Model">
<unit bldFile="mulwidgets/muldatamodel/group"/>
</component>
- <component id="mulwidgets_common" filter="s60" name="MUL Common">
+ <component id="mulwidgets_common" filter="s60" name="MUL Common Utils">
<unit bldFile="mulwidgets/common/group"/>
</component>
<component id="gesturehelper" filter="s60" name="Gesture Helper">
<unit bldFile="mulwidgets/gesturehelper/group"/>
</component>
- <component id="mulcoverflowwidget" filter="s60" name="MUL Coverflow Widget">
+ <component id="mulcoverflowwidget" filter="s60" name="MUL CoverFlow Widget">
<unit bldFile="mulwidgets/mulcoverflowwidget/group"/>
</component>
<component id="mulsliderwidget" filter="s60" name="MUL Slider Widget">
@@ -66,9 +63,6 @@
<component id="alfscrollbarwidget" filter="s60" name="ALF Scrollbar Widget">
<unit bldFile="mulwidgets/alfscrollbarwidget/group"/>
</component>
- <component id="mulwidgets_build" filter="s60" name="MUL Widgets Build">
- <unit bldFile="mulwidgets/group"/>
- </component>
</collection>
</package>
</SystemDefinition>
--- a/symbian3/mw/opensrv/package_definition_3.0.xml Wed Feb 03 19:36:09 2010 +0000
+++ b/symbian3/mw/opensrv/package_definition_3.0.xml Wed Feb 03 20:06:22 2010 +0000
@@ -2,22 +2,19 @@
<SystemDefinition schema="3.0.0">
<package id="opensrv" name="Open Services" levels="prt lib server eng">
<collection id="loudmouth" name="Loudmouth" level="prt">
+ <!-- collection is really a component so it needs to be moved down a directory -->
<component id="loudmouth_build" filter="s60" name="Loudmouth Build" introduced="^2">
<unit bldFile="loudmouth/group"/>
</component>
- <component id="loudmouth_test" filter="s60" name="Loudmouth Test" purpose="development" introduced="^2">
- <!-- <unit bldFile="loudmouth/tsrc/group"/> -->
- </component>
</collection>
<collection id="libtelepathy" name="Telepathy Library" level="lib">
+ <!-- collection is really a component so it needs to be moved down a directory -->
<component id="libtelepathy_build" filter="s60" name="Telepathy Library Build" introduced="^2">
<unit bldFile="libtelepathy/group"/>
</component>
- <component id="libtelepathy_test" filter="s60" name="Telepathy Library Test" purpose="development" introduced="^2">
- <!-- <unit bldFile="libtelepathy/tsrc/group"/> -->
- </component>
</collection>
<collection id="telepathygabble" name="Telepathy Gabble" level="eng">
+ <!-- collection is really a component so it needs to be moved down a directory -->
<component id="telepathygabble_build" filter="s60" name="Telepathy Gabble Build" introduced="^2">
<unit bldFile="telepathygabble/group"/>
</component>
@@ -29,17 +26,14 @@
<component id="isoserver" filter="s60" name="ISO Server" introduced="^2">
<unit bldFile="isolationserver/isoserver/group"/>
</component>
- <component id="isolationserver_test" filter="s60" name="Isloation Server Test" purpose="development" introduced="^2">
- <!-- <unit bldFile="isolationserver/tsrc/group"/> -->
- </component>
<component id="isolationserver_build" filter="s60" name="Isloation Server Build" introduced="^2">
+ <!-- needs #includes removed. either move the exports to another component or make this a ROM component -->
<unit bldFile="isolationserver/group"/>
</component>
</collection>
<collection id="opensrv_info" name="Open Services Info" level="eng">
<component id="opensrv_plat" filter="s60" name="Open Services Platform Interfaces" class="api" introduced="^2">
<unit bldFile="opensrv_plat/group"/>
- <!-- <unit bldFile="opensrv_plat/messagequeue_api/tsrc/group"/> -->
</component>
</collection>
</package>
--- a/symbian3/mw/phonesrv/package_definition_3.0.xml Wed Feb 03 19:36:09 2010 +0000
+++ b/symbian3/mw/phonesrv/package_definition_3.0.xml Wed Feb 03 20:06:22 2010 +0000
@@ -1,9 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<SystemDefinition schema="3.0.0">
<package id="phonesrv" name="Telephony and SIM Services" levels="plugin framework server generic specific">
- <collection id="phonecmdhandler" name="Phone Command Handler" level="generic">
- <component id="phonecmdhnlr" filter="s60" name="Phone Command Handler">
- <unit bldFile="phonecmdhandler/phonecmdhnlr/group"/>
+ <collection id="telutils" name="Telephony Utils" level="generic">
+ <component id="phoneparser" filter="s60" name="Phone Parser">
+ <unit bldFile="telutils/phoneparser/group"/>
+ </component>
+ <component id="telephonyservice" filter="s60" name="Telephony Service">
+ <unit bldFile="telutils/telephonyservice/group"/>
</component>
</collection>
<collection id="cbs" name="Cellular Baseband Services" level="plugin">
@@ -14,6 +17,26 @@
<unit bldFile="cbs/cbsui/group"/>
</component>
</collection>
+ <collection id="cellular" name="Cellular" level="server">
+ <component id="telephonysettings" filter="s60" name="Telephony Settings">
+ <unit bldFile="cellular/telephonysettings/group"/>
+ </component>
+ <component id="sssettings" filter="s60" name="Supplementary Service Settings">
+ <unit bldFile="cellular/sssettings/group"/>
+ </component>
+ <component id="psetnotesui" filter="s60" name="Phone Settings Notes UI">
+ <unit bldFile="cellular/psetnotesui/group"/>
+ </component>
+ <component id="servicerequest" filter="s60" name="Service Request">
+ <unit bldFile="cellular/servicerequest/group"/>
+ </component>
+ <component id="cellular_test" filter="s60,api_test" name="Cellular Tests" purpose="development">
+ <!-- can only have one unit. Need to #include from a single bld.inf (cellular/tsrc/bld.inf?) -->
+ <unit unitID="tedo.PsetNotesUi.test" bldFile="cellular/PsetNotesUi/tsrc/public/basic/group"/>
+ <unit unitID="tedo.SSSettings.test" bldFile="cellular/SSSettings/tsrc/public/basic/group"/>
+ <unit unitID="tedo.telephonysettings.test" bldFile="cellular/telephonysettings/tsrc/public/basic/group"/>
+ </component>
+ </collection>
<collection id="convergedcallengine" name="Converged Call Engine" level="framework">
<component id="callprovider" filter="s60" name="Call Provider">
<unit bldFile="convergedcallengine/callprovider/group"/>
@@ -23,9 +46,6 @@
</component>
<component id="spsettings" filter="s60" name="Service Provider Settings">
<unit bldFile="convergedcallengine/spsettings/group"/>
- <!-- include the rest in the above? -->
- <!-- <unit bldFile="convergedcallengine/spsettings/tsrc/public/basic/group"/> -->
- <!-- <unit bldFile="convergedcallengine/spsettings/tsrc/public/basic/spsettingsut/group"/> -->
</component>
<component id="cenrepdatabase" filter="s60" name="CCE Cenrep Database">
<unit bldFile="convergedcallengine/cenrepdatabase/group"/>
@@ -37,6 +57,16 @@
<!-- should spell out CS in name -->
<unit bldFile="convergedcallengine/csplugin/group"/>
</component>
+ <component id="convergedcallengine_test" filter="s60,api_test" name="CCE Tests" purpose="development">
+ <!-- can only have one unit. Need to #include from a single bld.inf (convergedcallengine/tsrc/bld.inf?) -->
+ <unit unitID="tedo.cce.test" bldFile="convergedcallengine/cce/tsrc/public/basic/group"/>
+ <unit unitID="tedo.spsettings.test" bldFile="convergedcallengine/spsettings/tsrc/public/basic/group"/>
+ </component>
+ </collection>
+ <collection id="engines" name="Telephony Engines" level="specific">
+ <component id="vmbxengine" filter="s60" name="Voice Mailbox Engine">
+ <unit bldFile="engines/vmbxengine/group"/>
+ </component>
</collection>
<collection id="networkhandling" name="Network Handling" level="plugin">
<component id="networkhandlingengine" filter="s60" name="Network Handling Engine">
@@ -62,8 +92,14 @@
<component id="callui" filter="s60" name="Call UI">
<unit bldFile="phoneclientserver/callui/group"/>
</component>
+ <component id="phoneclientserver_test" filter="s60,api_test" name="Phone Client/Server Tests" purpose="development">
+ <!-- can only have one unit. Need to #include from a single bld.inf (phoneclientserver/tsrc/bld.inf?) -->
+ <unit unitID="tedo.aiwdialdata.test" bldFile="phoneclientserver/aiwdialdata/tsrc/public/basic/group"/>
+ <unit unitID="tedo.dialutils.test" bldFile="phoneclientserver/dialutils/tsrc/public/basic/group"/>
+ <unit unitID="tedo.phoneclient.test" bldFile="phoneclientserver/phoneclient/tsrc/public/basic/group"/>
+ </component>
</collection>
- <collection id="satengine" name="SAT Engine" level="generic">
+ <collection id="satengine" name="SIM Application Toolkit Engine" level="generic">
<component id="satserver" filter="s60" name="SAT Server">
<unit bldFile="satengine/satserver/group"/>
</component>
@@ -76,46 +112,27 @@
<unit bldFile="satui/satplugin/group"/>
</component>
</collection>
- <collection id="telutils" name="Telephony Utils" level="generic">
- <component id="phoneparser" filter="s60" name="Phone Parser">
- <unit bldFile="telutils/phoneparser/group"/>
- </component>
- <component id="telephonyservice" filter="s60" name="Telephony Service">
- <unit bldFile="telutils/telephonyservice/group"/>
- </component>
- </collection>
- <collection id="cellular" name="Cellular" level="server">
- <component id="telephonysettings" filter="s60" name="Telephony Settings">
- <unit bldFile="cellular/telephonysettings/group"/>
- </component>
- <component id="sssettings" filter="s60" name="Supplementary Service Settings">
- <unit bldFile="cellular/sssettings/group"/>
- </component>
- <component id="psetnotesui" filter="s60" name="Phone Settings Notes UI">
- <unit bldFile="cellular/psetnotesui/group"/>
- </component>
- <component id="servicerequest" filter="s60" name="Service Request">
- <unit bldFile="cellular/servicerequest/group"/>
- </component>
- </collection>
- <collection id="engines" name="Telephony Engines" level="specific">
- <component id="vmbxengine" filter="s60" name="Voice Mailbox Engine">
- <unit bldFile="engines/vmbxengine/group"/>
+ <collection id="phonecmdhandler" name="Phone Command Handler" level="generic">
+ <component id="phonecmdhnlr" filter="s60" name="Phone Command Handler">
+ <unit bldFile="phonecmdhandler/phonecmdhnlr/group"/>
</component>
</collection>
<collection id="phonesrv_info" name="Telephony and SIM Services Info" level="specific">
<component id="phonesrv_plat" filter="s60" name="Telephony and SIM Services Platform Interfaces" class="api">
<unit bldFile="phonesrv_plat/group"/>
- <!-- include the rest in the above? -->
- <!-- <unit bldFile="phonesrv_plat/call_information_api/tsrc/group"/> -->
- <!-- <unit bldFile="phonesrv_plat/call_information_mediator_api/tsrc/ut_callinfos/group"/> -->
- <!-- <unit bldFile="phonesrv_plat/phone_client_emergency_call_api/tsrc/group"/> -->
- <!-- <unit bldFile="phonesrv_plat/sat_client_api/tsrc/group"/> -->
- <!-- <unit bldFile="phonesrv_plat/sat_refresh_api/tsrc/group"/> -->
</component>
<component id="phonesrv_pub" filter="s60" name="Telephony and SIM Services Public Interfaces" class="api">
<unit bldFile="phonesrv_pub/group"/>
</component>
+ <component id="phonesrv_test" filter="s60,api_test" name="Telephony and SIM Services Tests" purpose="development">
+ <!-- can only have one unit. Need to #include from a single bld.inf (phonesrv_plat/tsrc/bld.inf?) -->
+ <unit unitID="tedo.call_information_api.test" bldFile="phonesrv_plat/call_information_api/tsrc/group"/>
+ <unit unitID="tedo.sat_client_api.test" bldFile="phonesrv_plat/sat_client_api/tsrc/group"/>
+ <unit unitID="tedo.sat_refresh_api.test" bldFile="phonesrv_plat/sat_refresh_api/tsrc/group"/>
+ <unit unitID="tedo.sat_service_api.test" bldFile="phonesrv_plat/sat_service_api/tsrc/group"/>
+ <unit unitID="tedo.telephony_mediator_api.test" bldFile="phonesrv_plat/telephony_mediator_api/tsrc/ut_telephony_mediator_api/group"/>
+ <unit unitID="tedo.call_remote_party_information_api.test" bldFile="phonesrv_plat/call_remote_party_information_api/tsrc/group"/>
+ </component>
</collection>
</package>
</SystemDefinition>
--- a/symbian3/mw/platformtools/package_definition_3.0.xml Wed Feb 03 19:36:09 2010 +0000
+++ b/symbian3/mw/platformtools/package_definition_3.0.xml Wed Feb 03 20:06:22 2010 +0000
@@ -2,13 +2,11 @@
<SystemDefinition schema="3.0.0">
<package id="platformtools" name="Platform Tools">
<collection id="gfxconversion" name="Graphics Conversion">
- <component id="bmconv_s60" filter="s60" name="S60 Bitmap Converter">
- <!-- component need to be moved to appropriate location -->
- <unit bldFile="/tools/platformtools/gfxconversion/bmconv_s60/group"/>
+ <component id="bmconv_s60" filter="s60" name="S60 Bitmap Converter" target="desktop">
+ <unit bldFile="gfxconversion/bmconv_s60/group"/>
</component>
- <component id="mifconv" filter="s60" name="Multi Icon File Converter">
- <!-- component need to be moved to appropriate location -->
- <unit bldFile="/tools/platformtools/gfxconversion/mifconv/group"/>
+ <component id="mifconv" filter="s60" name="Multi Icon File Converter" target="desktop">
+ <unit bldFile="gfxconversion/mifconv/group"/>
</component>
</collection>
</package>
--- a/symbian3/mw/remotemgmt/package_definition_3.0.xml Wed Feb 03 19:36:09 2010 +0000
+++ b/symbian3/mw/remotemgmt/package_definition_3.0.xml Wed Feb 03 20:06:22 2010 +0000
@@ -1,18 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<SystemDefinition schema="3.0.0">
<package id="remotemgmt" name="Remote Management" levels="plugin framework server generic specific">
- <collection id="omaprovisioning" name="OMA Provisioning" level="specific">
- <component id="pnputil" filter="s60" name="PnP Util">
- <unit bldFile="omaprovisioning/pnputil/group"/>
- <!-- should the test bld.inf be #included? -->
- <!-- <unit bldFile="omaprovisioning/pnputil/tsrc/moduletest/group"/> -->
- </component>
- <component id="provisioning" filter="s60" name="Provisioning">
- <unit bldFile="omaprovisioning/provisioning/group"/>
- <!-- should the test bld.inf be #included? -->
- <!-- <unit bldFile="omaprovisioning/provisioning/tsrc/moduletest/group"/> -->
- </component>
- </collection>
<collection id="policymanagement" name="Policy Management" level="generic">
<component id="pmdmadapter" filter="s60" name="PM DM Adapter" class="plugin">
<unit bldFile="policymanagement/pmdmadapter/group"/>
@@ -24,95 +12,27 @@
<unit bldFile="policymanagement/policyengine/group"/>
</component>
<component id="policymanagement_build" filter="s60" name="Policy Management Build">
- <!-- should un#include above units-->
+ <!-- need to distribute exports, etc into the other components and remove this-->
<unit bldFile="policymanagement/group"/>
</component>
</collection>
<collection id="syncmlfw" name="SyncML Framework" level="server">
- <component id="syncmlfw_common" filter="s60" name="SyncML Framework Common">
- <!-- can only have one unit, need to have these #included from a single bld.inf -->
- <unit bldFile="syncmlfw/common/alerthandler/bld"/>
- <unit bldFile="syncmlfw/common/alertqueue/bld"/>
- <unit bldFile="syncmlfw/common/debug/bld"/>
- <unit bldFile="syncmlfw/common/historylog/bld"/>
- <unit bldFile="syncmlfw/common/http/bld"/>
- <unit bldFile="syncmlfw/common/inc"/>
- <unit bldFile="syncmlfw/common/inc/modifiedheaders"/>
- <unit bldFile="syncmlfw/common/inc/policy"/>
- <unit bldFile="syncmlfw/common/inc/symbianheaders"/>
- <unit bldFile="syncmlfw/common/notifiers/inc"/>
- <unit bldFile="syncmlfw/common/obex/obexclient/bld"/>
- <unit bldFile="syncmlfw/common/obex/obexcommserver/bld"/>
- <unit bldFile="syncmlfw/common/obex/obexdmplugin/bld"/>
- <unit bldFile="syncmlfw/common/obex/obexdsplugin/bld"/>
- <unit bldFile="syncmlfw/common/obex/obexserverbinding/bld"/>
- <unit bldFile="syncmlfw/common/sosserver/bld"/>
- <unit bldFile="syncmlfw/common/sosserver_clientapi/bld"/>
- <unit bldFile="syncmlfw/common/sosserver_privateapi/bld"/>
- <unit bldFile="syncmlfw/common/sosserver_transporthandler/bld"/>
- <unit bldFile="syncmlfw/common/syncagent/bld"/>
- <unit bldFile="syncmlfw/common/transport/bld"/>
- <unit bldFile="syncmlfw/common/wbxml/bld"/>
- <unit bldFile="syncmlfw/common/xml/bld"/>
- </component>
- <component id="ds" filter="s60" name="Data Sync">
- <!-- can only have one unit, need to have these #included from a single bld.inf -->
- <unit bldFile="syncmlfw/ds/adapterlog/bld"/>
- <unit bldFile="syncmlfw/ds/adapters/dataproviderbase/bld"/>
- <unit bldFile="syncmlfw/ds/agentlog/bld"/>
- <unit bldFile="syncmlfw/ds/alerthandler/bld"/>
- <unit bldFile="syncmlfw/ds/dsutils/changefinder/bld"/>
- <unit bldFile="syncmlfw/ds/dsutils/dbcaps/bld"/>
- <unit bldFile="syncmlfw/ds/dsutils/filter/bld"/>
- <unit bldFile="syncmlfw/ds/dsutils/filterutils/bld"/>
- <unit bldFile="syncmlfw/ds/dsutils/profileutil/bld"/>
- <unit bldFile="syncmlfw/ds/dsutils/storeformat/bld"/>
- <unit bldFile="syncmlfw/ds/hostserver/dshostclient/bld"/>
- <unit bldFile="syncmlfw/ds/hostserver/dshostserverbase/bld"/>
- <unit bldFile="syncmlfw/ds/hostserver/dshostservers/bld"/>
- <unit bldFile="syncmlfw/ds/inc"/>
- <unit bldFile="syncmlfw/ds/netmon/bld"/>
- <!-- <unit bldFile="syncmlfw/ds/ota/bld"/> -->
- <unit bldFile="syncmlfw/ds/provisioningadapter/bld"/>
- <unit bldFile="syncmlfw/ds/settings/bld"/>
- <unit bldFile="syncmlfw/ds/syncagent/bld"/>
- <unit bldFile="syncmlfw/ds/wappushalert/bld"/>
- </component>
- <component id="dm" filter="s60" name="Device Management">
- <!-- can only have one unit, need to have these #included from a single bld.inf -->
- <unit bldFile="syncmlfw/dm/bld"/>
- <unit bldFile="syncmlfw/dm/callbackserver/bld"/>
- <unit bldFile="syncmlfw/dm/dmutils/bld"/>
- <unit bldFile="syncmlfw/dm/hostserver/dmhostserverbase/bld"/>
- <unit bldFile="syncmlfw/dm/hostserver/dmhostservers/bld"/>
- <unit bldFile="syncmlfw/dm/provisioningadapter/bld"/>
- <unit bldFile="syncmlfw/dm/settings/bld"/>
- <unit bldFile="syncmlfw/dm/syncagent/bld"/>
- <unit bldFile="syncmlfw/dm/treedbclient/bld"/>
- <unit bldFile="syncmlfw/dm/treedbhandler/bld"/>
- <unit bldFile="syncmlfw/dm/treemodule/bld"/>
- <!-- <unit bldFile="syncmlfw/dm/tsrc/group"/> -->
- <unit bldFile="syncmlfw/dm/wappushalert/bld"/>
- </component>
- <component id="syncmlnotifier" filter="s60" name="SyncML Notifier">
- <unit bldFile="syncmlfw/syncmlnotifier/group"/>
- </component>
- <component id="syncservice" filter="s60" name="Sync Service">
- <unit bldFile="syncmlfw/syncservice/group"/>
- </component>
<component id="syncmlfw_build" filter="s60" name="SyncML Framework Build">
- <!-- should un#include the above as necessary -->
+ <!-- need to break this up into components. Too convoluted a structure to be in a single bld.inf-->
<unit bldFile="syncmlfw/group"/>
</component>
- </collection>
+ </collection>
<collection id="terminalsecurity" name="Terminal Security" level="specific">
<component id="scp" filter="s60" name="Security Code Proxy">
<!-- can only have one unit, need to have these #included from a single bld.inf -->
<unit bldFile="terminalsecurity/scp/scpclient/group"/>
- <unit bldFile="terminalsecurity/scp/scphistoryplugin/group"/>
+ <unit bldFile="terminalsecurity/scp/scpdatabase/group"/>
+ <unit bldFile="terminalsecurity/scp/scpserver/group"/>
<unit bldFile="terminalsecurity/scp/scppatternplugin/group"/>
- <unit bldFile="terminalsecurity/scp/scpserver/group"/>
+ <unit bldFile="terminalsecurity/scp/scphistoryplugin/group"/>
<unit bldFile="terminalsecurity/scp/scptimestampplugin/group"/>
+ <unit bldfile="terminalsecurity/scp/scpeventhandler/group"/>
+ <unit bldfile="terminalsecurity/scp/dmeventnotifier/group"/>
</component>
<component id="terminalsecurity_client" filter="s60" name="Terminal Control Client">
<unit bldFile="terminalsecurity/client/group"/>
@@ -124,9 +44,18 @@
<unit bldFile="terminalsecurity/tcadapter/bld"/>
</component>
<component id="terminalsecurity_build" filter="s60" name="Terminal Security Build">
+ <!-- need to distribute exports, etc into the other components and remove this-->
<unit bldFile="terminalsecurity/group"/>
</component>
</collection>
+ <collection id="omaprovisioning" name="OMA Provisioning" level="specific">
+ <component id="pnputil" filter="s60" name="PnP Util">
+ <unit bldFile="omaprovisioning/pnputil/group"/>
+ </component>
+ <component id="provisioning" filter="s60" name="Provisioning">
+ <unit bldFile="omaprovisioning/provisioning/group"/>
+ </component>
+ </collection>
<collection id="devicediagnosticsfw" name="Device Diagnostics Framework" level="framework">
<component id="diagframework" filter="s60" name="Diagnostics Framework">
<unit bldFile="devicediagnosticsfw/diagframework/group"/>
@@ -140,45 +69,37 @@
<unit bldFile="devicediagnosticsfw/diagresultsdb/server/group"/>
</component>
<component id="devicediagnosticsfw_build" filter="s60" name="Device Diagnostics Framework Build">
+ <!-- need to distribute exports, etc into the other components and remove this-->
<unit bldFile="devicediagnosticsfw/group"/>
</component>
</collection>
+ <collection id="dcmofw" name="Device Capability Management Object Framework" level="framework">
+ <component id="dcmoclient" filter="s60" name="DCMO Client">
+ <unit bldFile="dcmofw/dcmoclient/group"/>
+ </component>
+ <component id="dcmoserver" filter="s60" name="DCMO Server">
+ <unit bldFile="dcmofw/dcmoserver/group"/>
+ </component>
+ <component id="dcmocustcmd" filter="s60" name="DCMO Custom Commands">
+ <unit bldFile="dcmofw/dcmocustcmd/group"/>
+ </component>
+ <component id="dcmofw_build" filter="s60" name="DCMO Build">
+ <!-- need to distribute exports, etc into the other components and remove this-->
+ <unit bldFile="dcmofw/group"/>
+ </component>
+ </collection>
<collection id="fotaapplication" name="FOTA Application" level="generic">
- <component id="fotaserver" filter="s60" name="FOTA Server">
- <!-- can only have one unit, need to put the configuration in the appropriate bld.inf -->
+ <!-- need to break up into components after resolving the #ifdefs -->
+ <component id="fotaapplication_build" filter="s60" name="FOTA Application Build">
<unit bldFile="fotaapplication/fotaserver/fotastartupextplg/group"/>
- <unit bldFile="fotaapplication/fotaserver/group"/>
- <!-- <unit bldFile="fotaapplication/fotaserver/fmsclient/group"/> -->
- <!-- <unit bldFile="fotaapplication/fotaserver/fmserver/group"/> -->
- <!-- <unit bldFile="fotaapplication/fotaserver/fotarfsplugin/group"/> -->
- </component>
- <component id="fotaapp" filter="s60" name="FOTA Application">
- <!-- should be able to get rid of this by configuring the above component -->
- <unit bldFile="fotaapplication/group"/>
</component>
</collection>
<collection id="remotemgmt_info" name="Remote Management Info" level="specific">
- <component id="remotemgmt_pub" filter="s60" name="Remote Management Public Interfaces" class="api">
- <unit bldFile="remotemgmt_pub/group"/>
- </component>
<component id="remotemgmt_plat" filter="s60" name="Remote Management Platform Interfaces" class="api">
<unit bldFile="remotemgmt_plat/group"/>
- <!-- can these be #included in the above one? -->
- <!-- <unit bldFile="remotemgmt_plat/common_agent_util_and_definitions_api/tsrc/group"/> -->
- <!-- <unit bldFile="remotemgmt_plat/data_synchronization_plugin_api/tsrc/group"/> -->
- <!-- <unit bldFile="remotemgmt_plat/dm_tree_apis/tsrc/group"/> -->
- <!-- <unit bldFile="remotemgmt_plat/dm_utils_api/tsrc/group"/> -->
- <!-- <unit bldFile="remotemgmt_plat/fota_engine_api/tsrc/group"/> -->
- <!-- <unit bldFile="remotemgmt_plat/oma_ds_extensions_api/tsrc/group"/> -->
- <!-- <unit bldFile="remotemgmt_plat/oma_provisioning_engine_api/tsrc/group"/> -->
- <!-- <unit bldFile="remotemgmt_plat/pnpms_utils_api/tsrc/group"/> -->
- <!-- <unit bldFile="remotemgmt_plat/policy_management_certificate_api/tsrc/group"/> -->
- <!-- <unit bldFile="remotemgmt_plat/policy_management_request_api/tsrc/group"/> -->
- <!-- <unit bldFile="remotemgmt_plat/scp_server_api/tsrc/group"/> -->
- <!-- <unit bldFile="remotemgmt_plat/setting_enforcement_info_api/tsrc/group"/> -->
- <!-- <unit bldFile="remotemgmt_plat/syncml_alert_api/tsrc/group"/> -->
- <!-- <unit bldFile="remotemgmt_plat/syncml_client_api/tsrc/group"/> -->
- <!-- <unit bldFile="remotemgmt_plat/terminal_security_device_lock_api/tsrc/group"/> -->
+ </component>
+ <component id="remotemgmt_pub" filter="s60" name="Remote Management Public Interfaces" class="api">
+ <unit bldFile="remotemgmt_pub/group"/>
</component>
</collection>
</package>
--- a/symbian3/mw/remotestorage/package_definition_3.0.xml Wed Feb 03 19:36:09 2010 +0000
+++ b/symbian3/mw/remotestorage/package_definition_3.0.xml Wed Feb 03 20:06:22 2010 +0000
@@ -13,8 +13,6 @@
</component>
<component id="mountmanager" filter="s60" name="RSFW Mount Manager">
<unit bldFile="remotestoragefw/mountmanager/group"/>
- <!-- does the test bld.inf need to be included in the above one? -->
- <!-- <unit bldFile="remotestoragefw/mountmanager/tsrc/public/basic/group"/> -->
</component>
<component id="webdavaccessplugin" filter="s60" name="WebDAV Access Plugin" class="plugin">
<unit bldFile="remotestoragefw/webdavaccessplugin/group"/>
@@ -23,13 +21,22 @@
<unit bldFile="remotestoragefw/remotefilesystemplugin/group"/>
</component>
<component id="remotestoragegsplugin" filter="s60" name="RS GS Plugin" class="plugin">
- <unit bldFile="remotestoragefw/gsplugin/group"/>
+ <meta rel="config">
+ <defined condition="__REMOTE_STORAGE_FW"/>
+ </meta>
+ <!-- uncomment the unit when configuration is in place, it's currently #included from remotestoragefw_build -->
+ <!-- <unit bldFile="remotestoragefw/gsplugin/group"/>-->
</component>
<component id="remotedriveconfigurationbiocontrol" filter="s60" name="Remote Drive Configuration BIO Control">
- <unit bldFile="remotestoragefw/remotedriveconfigurationbiocontrol/group"/>
+ <meta rel="config">
+ <defined condition="__REMOTE_STORAGE_FW"/>
+ </meta>
+ <!-- uncomment the unit when configuration is in place, it's currently #included from remotestoragefw_build -->
+ <!-- <unit bldFile="remotestoragefw/remotedriveconfigurationbiocontrol/group"/>-->
</component>
<component id="remotestoragefw_build" filter="s60" name="Remote Storage Framework Build">
- <!-- consider distributing exports to other components and removing this one -->
+ <!-- move exports to other components.
+ This is needed for #includes of configured component until congigiration is in place -->
<unit bldFile="remotestoragefw/group"/>
</component>
</collection>
--- a/symbian3/mw/securitysrv/package_definition_3.0.xml Wed Feb 03 19:36:09 2010 +0000
+++ b/symbian3/mw/securitysrv/package_definition_3.0.xml Wed Feb 03 20:06:22 2010 +0000
@@ -1,36 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<SystemDefinition schema="3.0.0">
<package id="securitysrv" name="Security Services" levels="plugin framework server generic specific">
- <collection id="gba" name="Generic Bootstrapping Architecture" level="server">
- <component id="uicc" filter="s60" name="UICC" class="plugin" introduced="^2">
- <unit bldFile="gba/uicc/group"/>
- </component>
- <component id="bootstrap" filter="s60" name="Bootstrap" introduced="^2">
- <unit bldFile="gba/bootstrap/group"/>
- </component>
- <component id="gbaserver" filter="s60" name="GBA Server" introduced="^2">
- <unit bldFile="gba/gbaserver/group"/>
- </component>
- <component id="gbaapi" filter="s60" name="GBA API" introduced="^2">
- <unit bldFile="gba/gbaapi/group"/>
- </component>
- <component id="gbafilter" filter="s60" name="GBA HTTP Filter" class="plugin" introduced="^2">
- <unit bldFile="gba/gbafilter/group"/>
- </component>
- <component id="gba_build" filter="s60" name="Generic Boot Architecture Build" introduced="^2">
- <unit bldFile="gba/group"/>
- </component>
- </collection>
- <collection id="wim" name="Wireless Identity Module " level="framework">
- <component id="swimreader" filter="s60" name="SWIM Reader"/>
- <component id="scard" filter="s60" name="Smart Card"/>
- <component id="wimutil" filter="s60" name="WIM Utils"/>
- <component id="wimserver" filter="s60" name="WIM Server"/>
- <component id="wimclient" filter="s60" name="WIM Client"/>
- <component id="wimplugin" filter="s60" name="WIM Plugin" class="plugin"/>
- <component id="wim_build" filter="s60" name="WIM Build">
- <!-- need to distribute bld.inf to empty components or collapse into a single component -->
- <unit bldFile="wim/group"/>
+ <collection id="cms" name="Certificate Management Service" level="server">
+ <!-- collection is really a component. Need to move down a directory-->
+ <component id="cms_build" filter="s60" name="CMS" introduced="^3">
+ <unit bldFile="cms/group"/>
</component>
</collection>
<collection id="pkiutilities" name="PKI Utilities" level="plugin">
@@ -56,29 +30,26 @@
<unit bldFile="pkiutilities/devicetoken/group"/>
</component>
<component id="certificates" filter="s60" name="Certificates">
- <unit bldFile="pkiutilities/certificates/group"/>
+ <unit bldFile="pkiutilities/certificates/group" filter="sf_build"/>
</component>
<component id="pkiutilities_build" filter="s60" name="PKI Utilities Build">
+ <!-- need to split this into the above components -->
<unit bldFile="pkiutilities/group"/>
</component>
<component id="ocsp" name="Online Certificate Status Protocol" introduced="^2" purpose="optional">
<unit bldFile="pkiutilities/ocsp/group" mrp="pkiutilities/ocsp/group/securitysrv_ocsp.mrp"/>
</component>
</collection>
- <collection id="remotelock" name="Remote Lock" level="generic">
- <component id="remotelocksettings" filter="s60" name="Remote Lock Settings"/>
- <component id="remotelockengine" filter="s60" name="Remote Lock Engine"/>
- <component id="remotelock_build" filter="s60" name="Remote Lock Build">
- <!-- need to distribute bld.inf to empty components or collapse into a single component -->
- <unit bldFile="remotelock/group"/>
+ <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"/>
</component>
</collection>
- <collection id="boottimeintegritycheck" name="Boot Time Integrity Check" level="plugin">
- <component id="trkdummy" filter="s60" name="Trk Dummy">
- <!-- <unit bldFile="boottimeintegritycheck/trkdummy/group"/> -->
- </component>
- <component id="boottimeintegritycheck_build" filter="s60" name="Boot Time Integrity Check Build">
- <unit bldFile="boottimeintegritycheck/group"/>
+ <collection id="remotelock" name="Remote Lock" level="generic">
+ <!-- collection is really a component. Need to move down a directory-->
+ <component id="remotelock_build" filter="s60" name="Remote Lock Build">
+ <unit bldFile="remotelock/group"/>
</component>
</collection>
<collection id="securitydialogs" name="Security Dialogs" level="specific">
@@ -94,19 +65,64 @@
<component id="securitynotifier" filter="s60" name="Security Notifier">
<unit bldFile="securitydialogs/securitynotifier/group"/>
</component>
- <component id="securityobserver" filter="s60" name="Security Observer">
- <unit bldFile="securitydialogs/securityobserver/group"/>
+ <component id="lockclient" filter="s60" name="Lock Client" introduced="^3">
+ <unit bldFile="securitydialogs/lockclient/group"/>
+ </component>
+ <component id="lockapp" filter="s60" name="Lock Application" introduced="^3">
+ <unit bldFile="securitydialogs/lockapp/group"/>
+ </component>
+ <component id="simlockui" filter="s60" name="SIM Lock UI" introduced="^3">
+ <unit bldFile="securitydialogs/simlockui/group"/>
+ </component>
+ </collection>
+ <collection id="boottimeintegritycheck" name="Boot Time Integrity Check" level="plugin">
+ <!-- collection is really a component. Need to move down a directory-->
+ <component id="boottimeintegritycheck_build" filter="s60" name="Boot Time Integrity Check Build">
+ <unit bldFile="boottimeintegritycheck/group"/>
+ </component>
+ </collection>
+ <collection id="gba" name="Generic Bootstrapping Architecture" level="server">
+ <component id="uicc" filter="s60" name="UICC" class="plugin" introduced="^2">
+ <unit bldFile="gba/uicc/group"/>
+ </component>
+ <component id="gbaserver" filter="s60" name="GBA Server" introduced="^2">
+ <unit bldFile="gba/gbaserver/group"/>
+ </component>
+ <component id="gbaapi" filter="s60" name="GBA API" introduced="^2">
+ <unit bldFile="gba/gbaapi/group"/>
+ </component>
+ <component id="gbafilter" filter="s60" name="GBA HTTP Filter" class="plugin" introduced="^2">
+ <unit bldFile="gba/gbafilter/group"/>
+ </component>
+ <component id="gba_build" filter="s60" name="Generic Boot Architecture Build" introduced="^2">
+ <!-- need to split this into the above components, or remove #includes and make this GBA ROM -->
+ <unit bldFile="gba/group"/>
+ </component>
+ </collection>
+ <collection id="devencdiskutils" name="Device Encryption Disk Utils" level="server">
+ <component id="devenccommonutils" filter="s60" name="Device Encryption Common Utils" introduced="^3">
+ <unit bldFile="devencdiskutils/DevEncCommonUtils/group"/>
+ </component>
+ <component id="devencrfsplugin" filter="s60" name="Device Encryption RFS Plugin" introduced="^3" class="plugin">
+ <unit bldFile="devencdiskutils/DevEncRfsPlugin/group"/>
+ </component>
+ <component id="pk5recognizer" filter="s60" name="Device Encryption Pk5 Recognizer" introduced="^3" class="plugin">
+ <unit bldFile="devencdiskutils/Pk5Recognizer/group"/>
+ </component>
+ <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">
+ <!-- need to split this into the above components, or remove #includes and make this a ROM component-->
+ <unit bldFile="devencdiskutils/group"/>
</component>
</collection>
<collection id="securitysrv_info" name="Security Services Info" level="specific">
<component id="secsrv_plat" name="Security Services Platform Interfaces" filter="s60" class="api">
<unit bldFile="secsrv_plat/group"/>
- <!-- <unit bldFile="secsrv_plat/devicelock_access_api/group"/> -->
- <!-- <unit bldFile="secsrv_plat/keyguard_access_api/group"/> -->
- <!-- <unit bldFile="secsrv_plat/lockapp_server_api/group"/> -->
</component>
- <component id="securitysrv_test" filter="s60" purpose="development" name="Security Services Test">
- <!-- <unit bldFile="tsrc/group"/> -->
+ <component id="securitysrv_test" filter="s60,api_test" purpose="development" name="Security Services Test">
+ <unit bldFile="tsrc/group"/>
</component>
<component id="securitysrv_metadata" name="Security Services Metadata" class="config" introduced="^2" purpose="development" target="desktop">
<unit mrp="securitysrv_info/securitysrv_metadata/securitysrv_metadata.mrp"/>
--- a/symbian3/mw/serviceapi/package_definition_3.0.xml Wed Feb 03 19:36:09 2010 +0000
+++ b/symbian3/mw/serviceapi/package_definition_3.0.xml Wed Feb 03 20:06:22 2010 +0000
@@ -3,66 +3,30 @@
<package id="serviceapi" name="Service API" levels="os mw1 mw2 app">
<!-- should break up this collection into something meaningful -->
<collection id="serviceproviders" name="Service Providers" level="mw1">
- <component id="sapi_applicationmanager" name="Application Manager SAPI" filter="s60" class="plugin">
- <unit bldFile="serviceproviders/sapi_applicationmanager/group"/>
- <!-- should test bld.inf be #included? -->
- <!-- <unit bldFile="serviceproviders/sapi_applicationmanager/tsrc/dev/cruntimetest/group"/> -->
- </component>
- <component id="sapi_calendar" name="Calendar SAPI" filter="s60" class="plugin">
- <unit bldFile="serviceproviders/sapi_calendar/group"/>
- <!-- should test bld.inf be #included? -->
- <!-- <unit bldFile="serviceproviders/sapi_calendar/tsrc/testing/tcalprovider_combined/group"/> -->
- </component>
<component id="sapi_contacts_vpbk" name="Contacts Phonebook SAPI" filter="s60" class="plugin">
<unit bldFile="serviceproviders/sapi_contacts_vpbk/group"/>
</component>
- <component id="sapi_landmarks" name="Landmarks SAPI" filter="s60" class="plugin">
- <unit bldFile="serviceproviders/sapi_landmarks/group"/>
- <!-- should test bld.infs be #included? -->
- <!-- <unit bldFile="serviceproviders/sapi_landmarks/tsrc/testing/tlandmarkstest/group"/> -->
- <!-- <unit bldFile="serviceproviders/sapi_landmarks/tsrc/dev/group"/> -->
- <!-- <unit bldFile="serviceproviders/sapi_landmarks/tsrc/testing/tlandmarksprovidertest/group"/> -->
- <!-- <unit bldFile="serviceproviders/sapi_landmarks/tsrc/dev/landmarks_inputparams/group"/> -->
- </component>
<component id="sapi_location" name="Location SAPI" filter="s60" class="plugin">
<unit bldFile="serviceproviders/sapi_location/group"/>
- <!-- should test bld.infs be #included? -->
- <!-- <unit bldFile="serviceproviders/sapi_location/tsrc/testing/performance/pgetloc/group"/> -->
- <!-- <unit bldFile="serviceproviders/sapi_location/tsrc/testing/performance/pgetlocopts/group"/> -->
- <!-- <unit bldFile="serviceproviders/sapi_location/tsrc/testing/performance/pgetlocasync/group"/> -->
- <!-- <unit bldFile="serviceproviders/sapi_location/tsrc/testing/performance/pgetbearing/group"/> -->
- <!-- <unit bldFile="serviceproviders/sapi_location/tsrc/dev/group"/> -->
- <!-- <unit bldFile="serviceproviders/sapi_location/tsrc/testing/performance/pgetdistance/group"/> -->
- <!-- <unit bldFile="serviceproviders/sapi_location/tsrc/testing/group"/> -->
- <!-- <unit bldFile="serviceproviders/sapi_location/tsrc/testing/performance/pmove/group"/> -->
- </component>
- <component id="sapi_logging" name="Logging SAPI" filter="s60" class="plugin">
- <unit bldFile="serviceproviders/sapi_logging/group"/>
- <!-- <unit bldFile="serviceproviders/sapi_logging/tsrc/dev/group"/> -->
</component>
<component id="sapi_mediamanagement" name="Media Management SAPI" filter="s60" class="plugin">
<unit bldFile="serviceproviders/sapi_mediamanagement/group"/>
- <!-- should test bld.infs be #included? -->
- <!-- <unit bldFile="serviceproviders/sapi_mediamanagement/tsrc/dev/taiwmediamgmttest/group"/> -->
- <!-- <unit bldFile="serviceproviders/sapi_mediamanagement/tsrc/testing/performance/runtime_perf/group"/> -->
- <!-- <unit bldFile="serviceproviders/sapi_mediamanagement/tsrc/testing/performance/s60_perf/group"/> -->
+ </component>
+ <component id="sapi_landmarks" name="Landmarks SAPI" filter="s60" class="plugin">
+ <unit bldFile="serviceproviders/sapi_landmarks/group"/>
</component>
<component id="sapi_messaging" name="Messaging SAPI" filter="s60" class="plugin">
<unit bldFile="serviceproviders/sapi_messaging/group"/>
- <!-- should test bld.infs be #included? -->
- <!-- <unit bldFile="serviceproviders/sapi_messaging/tsrc/testing/performance/notify/group"/> -->
- <!-- <unit bldFile="serviceproviders/sapi_messaging/tsrc/testing/performance/status/group"/> -->
- <!-- <unit bldFile="serviceproviders/sapi_messaging/tsrc/testing/performance/delete/group"/> -->
- <!-- <unit bldFile="serviceproviders/sapi_messaging/tsrc/testing/performance/getlist/group"/> -->
- <!-- <unit bldFile="serviceproviders/sapi_messaging/tsrc/testing/performance/s60_getlist/group"/> -->
- <!-- <unit bldFile="serviceproviders/sapi_messaging/tsrc/testing/performance/s60_asyncsend/group"/> -->
- <!-- <unit bldFile="serviceproviders/sapi_messaging/tsrc/testing/performance/s60_notify/group"/> -->
- <!-- <unit bldFile="serviceproviders/sapi_messaging/tsrc/testing/performance/send/group"/> -->
- <!-- <unit bldFile="serviceproviders/sapi_messaging/tsrc/testing/performance/s60_status/group"/> -->
- <!-- <unit bldFile="serviceproviders/sapi_messaging/tsrc/testing/tmessagingprovidertest/group"/> -->
- <!-- <unit bldFile="serviceproviders/sapi_messaging/tsrc/testing/performance/s60_delete/group"/> -->
- <!-- <unit bldFile="serviceproviders/sapi_messaging/tsrc/testing/performance/s60_send/group"/> -->
- <!-- <unit bldFile="serviceproviders/sapi_messaging/tsrc/testing/performance/asyncsend/group"/> -->
+ </component>
+
+ <component id="sapi_applicationmanager" name="Application Manager SAPI" filter="s60" class="plugin">
+ <unit bldFile="serviceproviders/sapi_applicationmanager/group"/>
+ </component>
+ <component id="sapi_calendar" name="Calendar SAPI" filter="s60" class="plugin">
+ <unit bldFile="serviceproviders/sapi_calendar/group"/>
+ </component>
+ <component id="sapi_logging" name="Logging SAPI" filter="s60" class="plugin">
+ <unit bldFile="serviceproviders/sapi_logging/group"/>
</component>
<component id="sapi_sensor" name="Sensor SAPI" filter="s60" class="plugin">
<unit bldFile="serviceproviders/sapi_sensor/group"/>
@@ -72,19 +36,14 @@
</component>
<component id="sapi_serviceregistry" name="Service Registry SAPI" filter="s60" class="plugin">
<unit bldFile="serviceproviders/sapi_serviceregistry/group"/>
- <!-- should test bld.infs be #included? -->
- <!-- <unit bldFile="serviceproviders/sapi_serviceregistry/tsrc/dev/group"/> -->
</component>
- </collection>
- <collection id="serviceapi_info" name="Service API Info" level="app">
+ <component id="jsapi" name="Javascript API" filter="s60" class="plugin">
+ <unit bldFile="serviceproviders/jsapi/group"/>
+ </component>
<component id="serviceproviders_build" filter="s60" name="Service API Build">
- <!-- can the exports be distributed? -->
+ <!-- distribute the exports or make this a ROM component by removing the #includes -->
<unit bldFile="serviceproviders/group"/>
</component>
- <component id="serviceapi_test" filter="s60" name="Service API Test" purpose="development">
- <!-- Does this need to exist? -->
- <!-- <unit bldFile="tsrc/group"/> -->
- </component>
</collection>
</package>
</SystemDefinition>
--- a/symbian3/mw/serviceapifw/package_definition_3.0.xml Wed Feb 03 19:36:09 2010 +0000
+++ b/symbian3/mw/serviceapifw/package_definition_3.0.xml Wed Feb 03 20:06:22 2010 +0000
@@ -1,11 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<SystemDefinition schema="3.0.0">
<package id="serviceapifw" name="Service API Framework" levels="plugin framework server generic specific">
- <collection id="languageinterworkingfw" name="Language Interworking Framework" level="framework">
- <component id="lifwservicehandler" filter="s60" name="Service Handler">
- <unit bldFile="languageinterworkingfw/servicehandler/group"/>
- </component>
- </collection>
<collection id="rtsecuritymanager" name="Runtime Security Manager" level="server">
<component id="rtsecuritymanagerutil" filter="s60" name="Runtime Security Manager Util">
<unit bldFile="rtsecuritymanager/rtsecuritymanagerutil/group"/>
@@ -17,21 +12,21 @@
<unit bldFile="rtsecuritymanager/rtsecuritymanagerclient/group"/>
</component>
<component id="rtsecuritymanager_build" filter="s60" name="Runtime Security Manager Build">
- <!-- consider moving the exports to the appropriate components -->
+ <!-- Move the export to the appropriate components, or make this a ROM component by removing the #includes -->
<unit bldFile="rtsecuritymanager/group"/>
</component>
</collection>
+ <collection id="languageinterworkingfw" name="Language Interworking Framework" level="framework">
+ <component id="lifwservicehandler" filter="s60" name="Service Handler">
+ <unit bldFile="languageinterworkingfw/servicehandler/group"/>
+ </component>
+ </collection>
<collection id="serviceapifw_info" name="Service API Framework Info" level="specific">
- <component id="serviceapifw_pub" filter="s60" name="Service API Framework Public Interfaces" class="api">
- <unit bldFile="serviceapifw_pub/group"/>
- </component>
<component id="serviceapifw_plat" filter="s60" name="Service API Framework Platform Interfaces" class="api">
<unit bldFile="serviceapifw_plat/group"/>
- <!-- these should be #included from the above bld.inf -->
- <unit bldFile="serviceapifw_plat/liw_criteria_api/tsrc/group"/>
- <unit bldFile="serviceapifw_plat/rtsecuritymanager_client_api/tsrc/group"/>
- <!-- <unit bldFile="serviceapifw_plat/rtsecuritymanager_common_api/tsrc/group"/> -->
- <!-- <unit bldFile="serviceapifw_plat/rtsecuritymanager_utility_api/tsrc/group"/> -->
+ </component>
+ <component id="serviceapifw_pub" filter="s60" name="Service API Framework Public Interfaces" class="api">
+ <unit bldFile="serviceapifw_pub/group"/>
</component>
</collection>
</package>
--- a/symbian3/mw/srvdiscovery/package_definition_3.0.xml Wed Feb 03 19:36:09 2010 +0000
+++ b/symbian3/mw/srvdiscovery/package_definition_3.0.xml Wed Feb 03 20:06:22 2010 +0000
@@ -6,6 +6,14 @@
<unit bldFile="servicediscoveryandcontrol/pnp/group" mrp="servicediscoveryandcontrol/pnp/group/servicediscoveryframework.mrp"/>
</component>
</collection>
+ <collection id="upnp" name="UPnP" level="server">
+ <component id="upnpstack_plat" name="UPnP Stack Platform Interfaces" introduced="^3" purpose="optional" class="api">
+ <unit bldFile="servicediscoveryandcontrol/upnpstack_plat/group"/>
+ </component>
+ <component id="upnpstack" name="UPnP Stack" introduced="^3" purpose="optional">
+ <unit bldFile="servicediscoveryandcontrol/upnpstack/group"/>
+ </component>
+ </collection>
<collection id="srvdiscovery_info" name="Service Discovery and Usage Info" level="specific">
<component id="srvdiscovery_metadata" name="Service Discovery and Usage Metadata" class="config" introduced="^2" purpose="development" target="desktop">
<unit mrp="srvdiscovery_info/srvdiscovery_metadata/srvdiscovery_metadata.mrp"/>
--- a/symbian3/mw/svgt/package_definition_3.0.xml Wed Feb 03 19:36:09 2010 +0000
+++ b/symbian3/mw/svgt/package_definition_3.0.xml Wed Feb 03 20:06:22 2010 +0000
@@ -8,14 +8,9 @@
</collection>
<collection id="svgtopt" name="SVG-T Engine" level="util">
<component id="svgtopt_build" filter="s60" name="SVG Engine" introduced="9.2">
+ <!-- component is at collection level. Needs to be moved down a directory -->
<unit bldFile="svgtopt/group"/>
</component>
- <component id="nvgdecoder" filter="s60" name="NVG Decoder" introduced="9.2">
- <!-- extract relevant parts of above bld.inf or remove this component -->
- </component>
- <component id="svgengineji" filter="s60" name="SVG Engine Java Interface" introduced="9.2">
- <!-- extract relevant parts of above bld.inf or remove this component -->
- </component>
<component id="svgtplugin" filter="s60" name="SVG Plugin" class="plugin" introduced="9.2">
<unit bldFile="svgtopt/svgtplugin/group"/>
</component>
--- a/symbian3/mw/uiaccelerator/package_definition_3.0.xml Wed Feb 03 19:36:09 2010 +0000
+++ b/symbian3/mw/uiaccelerator/package_definition_3.0.xml Wed Feb 03 20:06:22 2010 +0000
@@ -1,49 +1,19 @@
<?xml version="1.0" encoding="UTF-8"?>
<SystemDefinition schema="3.0.0">
<package id="uiaccelerator" name="UI Accelerator" levels="plugin framework server ex if">
+ <collection id="uiaccelerator_info" name="UI Accelerator Info" level="if">
+ <component id="uiaccelerator_plat" filter="s60" name="UI Accelerator Platform Interfaces" class="api">
+ <unit bldFile="uiaccelerator_plat/group"/>
+ </component>
+ </collection>
<collection id="uiacceltk" name="UI Accelerator Toolkit" level="framework">
<component id="hitchcock" filter="s60" name="Hitchcock">
<unit bldFile="uiacceltk/hitchcock/group"/>
- <!-- are the following needed? if so, 'include from above -->
- <!-- <unit bldFile="uiacceltk/hitchcock/coretoolkit/group"/> -->
- <!-- <unit bldFile="uiacceltk/hitchcock/plugins/alftranseffect/alftranseffectplugin/group"/> -->
- <!-- <unit bldFile="uiacceltk/hitchcock/tracer/group"/> -->
- <!-- <unit bldFile="uiacceltk/hitchcock/tracer/traceextclient/group"/> -->
- <!-- <unit bldFile="uiacceltk/hitchcock/tracer/traceextplugin/group"/> -->
- </component>
- <component id="widgeteditors" filter="s60" name="Widget Editors">
- <unit bldFile="uiacceltk/widgeteditors/group"/>
</component>
<component id="uiacceltk_build" filter="s60" name="UI Accelerator Toolkit Build">
- <!-- consider distributing into other components -->
+ <!-- move into the other component, or remove the #include and make this UI Accelerator Toolkit ROM-->
<unit bldFile="uiacceltk/group"/>
</component>
</collection>
- <collection id="uiaccelexampleapps" name="UI Accelerator Example Apps" level="ex">
- <!-- are these unbuilt components? -->
- <component id="alfexanalogdialer" filter="s60" name="Accelerated LAF Example Analog Dialer" purpose="development">
- <!-- <unit bldFile="uiaccelexampleapps/alfexanalogdialer/group"/> -->
- </component>
- <component id="alfexstickers" filter="s60" name="Accelerated LAF Example Stickers" purpose="development">
- <!-- <unit bldFile="uiaccelexampleapps/alfexstickers/group"/> -->
- </component>
- </collection>
- <collection id="uiaccelerator_info" name="UI Accelerator Info" level="if">
- <component id="uiaccelerator_inc" filter="s60">
- <!-- is this needed? -->
- <!-- <unit bldFile="inc/group"/> -->
- </component>
- <component id="uiaccelerator_plat" filter="s60" name="UI Accelerator Platform Interfaces" class="api">
- <unit bldFile="uiaccelerator_plat/group"/>
- <!-- Can only have one bld.inf: include the test bld.infs from the above one if needed -->
- <unit bldFile="uiaccelerator_plat/alf_client_server_api/tsrc/group"/>
- <unit bldFile="uiaccelerator_plat/alf_core_toolkit_api/tsrc/group"/>
- <unit bldFile="uiaccelerator_plat/alf_editors_api/tsrc/group"/>
- <unit bldFile="uiaccelerator_plat/alf_extended_visual_api/tsrc/group"/>
- <unit bldFile="uiaccelerator_plat/alf_extension_api/tsrc/group"/>
- <unit bldFile="uiaccelerator_plat/alf_tracing_api/tsrc/group"/>
- <unit bldFile="uiaccelerator_plat/alf_visual_api/tsrc/group"/>
- </component>
- </collection>
</package>
</SystemDefinition>
--- a/symbian3/mw/uiresources/package_definition_3.0.xml Wed Feb 03 19:36:09 2010 +0000
+++ b/symbian3/mw/uiresources/package_definition_3.0.xml Wed Feb 03 20:06:22 2010 +0000
@@ -3,25 +3,32 @@
<package id="uiresources" name="UI Resources" levels="compile plugin framework server generic data">
<collection id="uiresources_info" name="UI Resources Info" level="data">
<component id="uiresources_plat" filter="s60" name="UI Resources Platform Interfaces" class="api">
- <!-- can only have one unit, need to include these from main one -->
<unit bldFile="uiresources_plat/group"/>
- <unit bldFile="uiresources_plat/cdl_api/tsrc/group"/>
- <unit bldFile="uiresources_plat/extended_fonts_api/tsrc/group"/>
- <unit bldFile="uiresources_plat/extended_skins_api/tsrc/group"/>
- <unit bldFile="uiresources_plat/graphic_configuration_api/tsrc/group"/>
- <unit bldFile="uiresources_plat/layout_data_api/tsrc/group"/>
- <unit bldFile="uiresources_plat/layout_system_private_api/tsrc/group"/>
- <unit bldFile="uiresources_plat/skins_image_attributes_api/tsrc/group"/>
</component>
<component id="uiresources_pub" filter="s60" name="UI Resources Public Interfaces" class="api">
- <!-- can only have one unit, need to include these from main one -->
<unit bldFile="uiresources_pub/group"/>
- <unit bldFile="uiresources_pub/font_definition_api/tsrc/group"/>
- <unit bldFile="uiresources_pub/graphics_api/tsrc/group"/>
- <unit bldFile="uiresources_pub/pictograph_api/tsrc/group"/>
- <unit bldFile="uiresources_pub/scalable_icons_api/tsrc/group"/>
- <unit bldFile="uiresources_pub/skins_api/tsrc/group"/>
</component>
+ <component id="uiresources_test" filter="s60,api_test" name="UI Resources Tests" purpose="development">
+ <unit bldFile="tsrc/group" filter="uiresources_api_all" />
+ </component>
+ <!-- are these custom filters needed? -->
+ <component id="uiresources_test_pat" filter="s60,api_test" name="UI Resources Platform API Tests" purpose="development">
+ <!-- can only have one unit. Need to #include from a common one -->
+ <unit bldFile="uiresources_plat/cdl_api/tsrc/group" filter="cdl_api" />
+ <unit bldFile="uiresources_plat/extended_fonts_api/tsrc/group" filter="extended_fonts_api" />
+ <unit bldFile="uiresources_plat/extended_skins_api/tsrc/group" filter="extended_skins_api" />
+ <unit bldFile="uiresources_plat/graphic_configuration_api/tsrc/group" filter="graphic_configuration_api" />
+ <unit bldFile="uiresources_plat/layout_data_api/tsrc/group" filter="layout_data_api" />
+ <unit bldFile="uiresources_plat/layout_system_private_api/tsrc/group" filter="layout_system_private_api" />
+ </component>
+ <component id="uiresources_test_pat" filter="s60,api_test" name="UI Resources Public API Tests" purpose="development">
+ <!-- can only have one unit. Need to #include from a common one -->
+ <unit bldFile="uiresources_plat/skins_image_attributes_api/tsrc/group" filter="skins_image_attributes_api" />
+ <unit bldFile="uiresources_pub/font_definition_api/tsrc/group" filter="font_definition_api" />
+ <unit bldFile="uiresources_pub/graphics_api/tsrc/group" filter="graphics_api" />
+ <unit bldFile="uiresources_pub/pictograph_api/tsrc/group" filter="pictograph_api" />
+ <unit bldFile="uiresources_pub/skins_api/tsrc/group" filter="skins_api" />
+ </component>
</collection>
<collection id="uigraphics" name="UI Graphics" level="generic">
<component id="bitmaps2" filter="s60" name="Bitmaps 2" class="config">
@@ -36,41 +43,20 @@
<component id="aknicon" filter="s60" name="Avkon Icon Framework">
<unit bldFile="uigraphics/aknicon/group"/>
</component>
- <component id="palette" filter="s60" name="Palette Utils">
- <!-- should this really be commented out? why? -->
- <!-- <unit bldFile="uigraphics/palette/group"/> -->
- </component>
</collection>
<collection id="layouts" name="Layouts" level="plugin">
<component id="cdl" filter="s60" name="Customization Definition Language">
- <!-- can only have one unti. Need to #include them or split into multiple components -->
+ <!-- can only have one unit. Need to #include them or split into multiple components -->
<unit bldFile="layouts/cdl/cdlengine/group"/>
<unit bldFile="layouts/cdl/cdlserver/group"/>
- <!-- <unit bldFile="layouts/cdl/cdlutils/cdlexplorer/group"/> -->
</component>
<component id="aknlayout2" filter="s60" name="Avkon Layout 2">
<unit bldFile="layouts/aknlayout2/group"/>
- <!-- need to do something with all these commented-out units -->
- <!-- <unit bldFile="layouts/aknlayout2/generated"/> -->
- <!-- <unit bldFile="layouts/aknlayout2/generated/nhd_akn_app"/> -->
- <!-- <unit bldFile="layouts/aknlayout2/generated/nhd_uiaccel"/> -->
- <!-- <unit bldFile="layouts/aknlayout2/generated/qhd_touch_akn_app"/> -->
- <!-- <unit bldFile="layouts/aknlayout2/generated/qhd_touch_uiaccel"/> -->
- <!-- <unit bldFile="layouts/aknlayout2/generated/qvga2_akn_app"/> -->
- <!-- <unit bldFile="layouts/aknlayout2/generated/qvga2_uiaccel"/> -->
- <!-- <unit bldFile="layouts/aknlayout2/generated/qvga_akn_app"/> -->
- <!-- <unit bldFile="layouts/aknlayout2/generated/qvga_uiaccel"/> -->
- <!-- <unit bldFile="layouts/aknlayout2/generated/vga3_akn_app"/> -->
- <!-- <unit bldFile="layouts/aknlayout2/generated/vga3_uiaccel"/> -->
- <!-- <unit bldFile="layouts/aknlayout2/generated/vga_akn_app"/> -->
- <!-- <unit bldFile="layouts/aknlayout2/generated/vga_touch_akn_app"/> -->
- <!-- <unit bldFile="layouts/aknlayout2/generated/vga_uiaccel"/> -->
</component>
</collection>
<collection id="skins" name="Skins" level="data">
<component id="aknskincontent" filter="s60" name="Avkon Skin Content" class="config">
<unit bldFile="skins/aknskincontent/group"/>
- <!-- <unit bldFile="skins/aknskincontent/srcdata/scalableseries60skin/mifindexdll"/> -->
</component>
<component id="aknskins" filter="s60" name="Avkon Skin Compiler">
<unit bldFile="skins/aknskins/group"/>
@@ -79,7 +65,6 @@
<collection id="pictographs" name="Pictographs" level="data">
<component id="aknpictograph" filter="s60" name="Avkon Pictograph">
<unit bldFile="pictographs/aknpictograph/group"/>
- <!-- <unit bldFile="pictographs/aknpictograph/tools/aknpictobitmapbuilder/group"/> -->
</component>
</collection>
<collection id="locales" name="Locales" level="framework">
@@ -101,27 +86,10 @@
</component>
</collection>
<collection id="helpthemes" name="Help Themes" level="data">
+ <!-- collection is really a component. Need to move down a directory -->
<component id="helpthemes_build" filter="s60" name="Help Themes Build" class="config">
<unit bldFile="helpthemes/group"/>
</component>
</collection>
- <collection id="aknlayoutcompiler" name="Avkon Layout Compiler" level="compile">
- <component id="aknlayoutcompiler_build" filter="s60" name="Avkon Layout Compiler Build">
- <!-- to be moved here -->
- <unit bldFile="../uitools/aknlayoutcompiler/group"/>
- </component>
- </collection>
- <collection id="cdlcompiler" name="CDL Compiler" level="compile">
- <component id="cdlcompiler_build" filter="s60" name="CDL Compiler Build">
- <!-- to be moved here -->
- <unit bldFile="../uitools/cdlcompiler/group"/>
- </component>
- </collection>
- <collection id="cdlcompilertoolkit" name="CDL Compiler Toolkit" level="compile">
- <component id="cdlcompilertoolkit_build" filter="s60" name="CDL Compiler Toolkit Build">
- <!-- to be moved here -->
- <unit bldFile="../uitools/cdlcompilertoolkit/group"/>
- </component>
- </collection>
</package>
-</SystemDefinition>
+</SystemDefinition>
\ No newline at end of file
--- a/symbian3/mw/uitools/package_definition_3.0.xml Wed Feb 03 19:36:09 2010 +0000
+++ b/symbian3/mw/uitools/package_definition_3.0.xml Wed Feb 03 20:06:22 2010 +0000
@@ -1,6 +1,18 @@
<?xml version="1.0" encoding="UTF-8"?>
<SystemDefinition schema="3.0.0">
<package id="uitools" name="UI Tools" levels="compile encode tool if">
+ <collection id="cdlcompilertoolkit" name="CDL Compiler Toolkit" level="compile">
+ <!-- collection is actually a component. Needs to be moved down a directory -->
+ <component id="cdlcompilertoolkit_build" filter="s60" name="CDL Compiler Toolkit Build">
+ <unit bldFile="cdlcompilertoolkit/group"/>
+ </component>
+ </collection>
+ <collection id="cdlcompiler" name="CDL Compiler" level="compile">
+ <!-- collection is actually a component. Needs to be moved down a directory -->
+ <component id="cdlcompiler_build" filter="s60" name="CDL Compiler Build">
+ <unit bldFile="cdlcompiler/group"/>
+ </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"/>
@@ -9,14 +21,26 @@
<unit bldFile="gfxtools/color/group"/>
</component>
</collection>
+ <collection id="aknlayoutcompiler" name="Avkon Layout Compiler" level="compile">
+ <!-- collection is actually a component. Needs to be moved down a directory -->
+ <component id="aknlayoutcompiler_build" filter="s60" name="Avkon Layout Compiler Build">
+ <unit bldFile="../uitools/aknlayoutcompiler/group"/>
+ </component>
+ </collection>
+ <collection id="skincompiler" name="Skin Compiler" level="compile">
+ <component id="aknskindesccompiler" filter="s60" name="Avkon Skin Descriptor Compiler">
+ <unit bldFile="skincompiler/AknSkinDescCompiler/group"/>
+ </component>
+ </collection>
<collection id="reszip" name="Resource Zip" level="encode">
+ <!-- collection is actually a component. Needs to be moved down a directory -->
<component id="reszip_build" filter="s60" name="Resource Zip Build">
<unit bldFile="reszip/group"/>
</component>
</collection>
<collection id="toollibraries" name="Tool Libraries" level="tool"/>
<collection id="svgtencoder" name="SVGT Encoder" level="encode">
- <component id="svgtenc" filter="s60" name="SVGT Encoder" target="desktop">
+ <component id="svgtenc" filter="s60" name="Standalone SVGT Encoder" target="desktop">
<unit bldFile="svgtencoder/svgtenc/standalone/group"/>
</component>
</collection>
--- a/symbian3/mw/usbservices/package_definition_3.0.xml Wed Feb 03 19:36:09 2010 +0000
+++ b/symbian3/mw/usbservices/package_definition_3.0.xml Wed Feb 03 20:06:22 2010 +0000
@@ -1,38 +1,23 @@
<?xml version="1.0" encoding="UTF-8"?>
<SystemDefinition schema="3.0.0">
<package id="usbservices" name="USB Services" levels="framework server generic specific plugin">
- <collection id="usbclasses" name="USB Classes" level="framework">
- <component id="usbobexclasscontroller" filter="s60" name="USB OBEX Class Controller" class="plugin">
- <unit bldFile="usbclasses/usbobexclasscontroller/group"/>
- <!-- <unit bldFile="usbclasses/usbobexclasscontroller/tsrc/group"/> -->
- </component>
- <component id="usbbasicpersonality" filter="s60" name="USB Basic Personality" class="plugin">
- <unit bldFile="usbclasses/usbbasicpersonality/group"/>
- </component>
- <component id="usbmscpersonality" filter="s60" name="USB MSC Personality" class="plugin">
- <unit bldFile="usbclasses/usbmscpersonality/group"/>
+ <collection id="usbservices_info" name="USB Services Info" level="plugin">
+ <component id="usbservices_plat" filter="s60" name="USB Services Platform Interfaces" class="api">
+ <unit bldFile="usbservices_plat/group"/>
</component>
- <component id="ptpstack" filter="s60" name="Picture Transfer Protocol Stack">
- <unit bldFile="usbclasses/ptpstack/group"/>
- </component>
- <component id="sicdusbplugin" filter="s60" name="SICD USB Plugin" class="plugin">
- <unit bldFile="usbclasses/sicdusbplugin/group"/>
- </component>
- <component id="ptpserver" filter="s60" name="Picture Transfer Protocol Server">
- <unit bldFile="usbclasses/ptpserver/group"/>
- <!-- <unit bldFile="usbclasses/ptpserver/ptpclasscontroller/group"/> -->
- </component>
- <component id="pictbridgeengine" filter="s60" name="PictBridge Engine">
- <unit bldFile="usbclasses/pictbridgeengine/group"/>
+ <component id="usbservices_test" filter="s60,api_test" name="USB Services Tests">
+ <unit bldFile="tsrc/group"/>
</component>
</collection>
<collection id="usbengines" name="USB Engines" level="generic">
+ <component id="usbotgwatcher" filter="s60" name="USB OTG Watcher">
+ <unit bldFile="usbengines/usbotgwatcher/group"/>
+ </component>
<component id="usbwatcher" filter="s60" name="USB Watcher">
<unit bldFile="usbengines/usbwatcher/group"/>
</component>
<component id="usblocodplugin" filter="s60" name="USB Local Connectivity Domain Plugin" class="plugin">
<unit bldFile="usbengines/usblocodplugin/group"/>
- <!-- <unit bldFile="usbengines/usblocodplugin/tsrc/group"/> -->
</component>
<component id="usbdevcon" filter="s60" name="USB Device Control">
<unit bldFile="usbengines/usbdevcon/group"/>
@@ -41,14 +26,39 @@
<unit bldFile="usbengines/usbremotepersonality/group"/>
</component>
</collection>
+ <collection id="usbclasses" name="USB Classes" level="framework">
+ <component id="usbobexclasscontroller" filter="s60" name="USB OBEX Class Controller" class="plugin">
+ <unit bldFile="usbclasses/usbobexclasscontroller/group"/>
+ </component>
+ <component id="usbbasicpersonality" filter="s60" name="USB Basic Personality" class="plugin">
+ <unit bldFile="usbclasses/usbbasicpersonality/group"/>
+ </component>
+ <component id="usbmscpersonality" filter="s60" name="USB MSC Personality" class="plugin">
+ <unit bldFile="usbclasses/usbmscpersonality/group"/>
+ </component>
+<!-- commented out in bld.inf. Should this be deleted?
+ <component id="ptpstack" filter="s60" name="Picture Transfer Protocol Stack">
+ <unit bldFile="usbclasses/ptpstack/group"/>
+ </component>
+ <component id="sicdusbplugin" filter="s60" name="SICD USB Plugin" class="plugin">
+ <unit bldFile="usbclasses/sicdusbplugin/group"/>
+ </component>
+ <component id="ptpserver" filter="s60" name="Picture Transfer Protocol Server">
+ <unit bldFile="usbclasses/ptpserver/group"/>
+ </component>-->
+ <component id="pictbridgeengine" filter="s60" name="PictBridge Engine">
+ <unit bldFile="usbclasses/pictbridgeengine/group"/>
+ </component>
+ <component id="usbphoneasmodem" filter="s60" name="USB Phone as Modem" introduced="^3">
+ <unit bldFile="usbclasses/usbphoneasmodem/group"/>
+ </component>
+ </collection>
<collection id="usbuis" name="USB UIs" level="specific">
<component id="usbui" filter="s60" name="USB UI">
<unit bldFile="usbuis/usbui/group"/>
- <!-- <unit bldFile="usbuis/usbui/tsrc/usbuiapitest/group"/> -->
</component>
<component id="usbuinotif" filter="s60" name="USB UI Notifiers">
<unit bldFile="usbuis/usbuinotif/group"/>
- <!-- <unit bldFile="usbuis/usbuinotif/tsrc/usbuinotifapitest/group"/> -->
</component>
<component id="imageprintuiprovider" filter="s60" name="ImagePrint UI Provider" class="plugin">
<unit bldFile="usbuis/imageprintuiprovider/group"/>
@@ -56,6 +66,9 @@
<component id="usbimageprintui" filter="s60" name="ImagePrint UI">
<unit bldFile="usbuis/imageprintui/group"/>
</component>
+ <component id="rndisui" filter="s60" name="Remote NDIS UI" introduced="^3">
+ <unit bldFile="usbuis/rndisui/group"/>
+ </component>
</collection>
</package>
</SystemDefinition>
--- a/symbian3/mw/videoutils/package_definition_3.0.xml Wed Feb 03 19:36:09 2010 +0000
+++ b/symbian3/mw/videoutils/package_definition_3.0.xml Wed Feb 03 20:06:22 2010 +0000
@@ -1,30 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<SystemDefinition schema="3.0.0">
<package id="videoutils" name="Video Utils" levels="eng util if">
- <collection id="dvrengine" name="DVR Engine" level="eng">
- <component id="commonrecordingengine" filter="s60" name="Common Recording Engine">
- <!-- can only have one unit, #include the others from the main nit -->
- <unit bldFile="dvrengine/commonrecordingengine/group"/>
- <unit bldFile="dvrengine/commonrecordingengine/dvrrtpcliphandler/group"/>
- <unit bldFile="dvrengine/commonrecordingengine/dvrrtpcliprecognizer/group"/>
- <unit bldFile="dvrengine/commonrecordingengine/dvrrtputils/group"/>
- </component>
- <component id="commonrecordingengineclient" filter="s60" name="Common Recording Engine Client">
- <unit bldFile="dvrengine/commonrecordingengineclient/group"/>
- </component>
- <component id="dvrengine_build" filter="s60" name="DVR Engine Build">
- <!-- should split this into the bld.infs above -->
- <unit bldFile="dvrengine/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="videoconnutility_build" filter="s60" name="Video Connection Utility Build">
- <unit bldFile="videoconnutility/group"/>
- </component>
- </collection>
<collection id="videoscheduler" name="Video Scheduler" level="util">
<component id="schedulerclient" filter="s60" name="Video Scheduler Client">
<unit bldFile="videoscheduler/schedulerclient/group"/>
@@ -32,24 +8,21 @@
<component id="schedulerserver" filter="s60" name="Video Scheduler Server">
<unit bldFile="videoscheduler/schedulerserver/group"/>
</component>
- <component id="videoscheduler_build" filter="s60" name="Video Scheduler Build">
- <!-- is this needed at all? Can the system include just be put in the above bld.infs? -->
- <unit bldFile="videoscheduler/group"/>
+ </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_plat" filter="s60" name="Video Utils Platform Interfaces" class="api">
<unit bldFile="videoutils_plat/group"/>
- <!-- do these test units need to be #included in the above bld.inf? -->
- <!-- <unit bldFile="videoutils_plat/videoconnutility_api/tsrc/group"/> -->
- <!-- <unit bldFile="videoutils_plat/videoconnutility_api/tsrc/vcxconnutiltestexe/group"/> -->
- <!-- <unit bldFile="videoutils_plat/videoconnutility_api/tsrc/vcxtestcommon/group"/> -->
- <!-- <unit bldFile="videoutils_plat/videoconnutility_api/tsrc/vcxtestutilmodule/group"/> -->
- <!-- <unit bldFile="videoutils_plat/videoscheduler_api/tsrc/group"/> -->
</component>
- <component id="videoutils_build" filter="s60" name="Video Utils Build">
- <!-- can this be split up into the above components?? -->
- <unit bldFile="group"/>
+ <component id="videoutils_test" filter="s60,api_test" name="Video Utils Tests">
+ <unit bldFile="tsrc/group"/>
</component>
</collection>
</package>
--- a/symbian3/mw/vpnclient/package_definition_3.0.xml Wed Feb 03 19:36:09 2010 +0000
+++ b/symbian3/mw/vpnclient/package_definition_3.0.xml Wed Feb 03 20:06:22 2010 +0000
@@ -1,166 +1,131 @@
<?xml version="1.0" encoding="UTF-8"?>
<SystemDefinition schema="3.0.0">
<package id="vpnclient" name="VPN Client" levels="engine ui api">
+ <!-- is the !oem_build filter needed? -->
+ <collection id="vpnapiimpl" name="VPN API Implementation" level="api">
+ <component id="vpnapi" filter="s60" name="VPN API">
+ <unit bldFile="vpnapiimpl/group" filter="!oem_build"/>
+ </component>
+ </collection>
<collection id="vpnengine" name="VPN Engine" level="engine">
<!-- too many components in this collection.
Probably best to group the binaries together into larger components
or maybe split the collection into more reasonable groups -->
<component id="eventmediatorapi" filter="s60" name="Event Mediator API">
- <unit bldFile="vpnengine/eventmediatorapi/group"/>
+ <unit bldFile="vpnengine/eventmediatorapi/group" filter="!oem_build"/>
</component>
<component id="eventviewer" filter="s60" name="Event Viewer">
- <unit bldFile="vpnengine/eventviewer/group"/>
+ <unit bldFile="vpnengine/eventviewer/group" filter="!oem_build"/>
</component>
<component id="vpnins" filter="s60" name="VPN Installer">
- <unit bldFile="vpnengine/vpnins/group"/>
- </component>
- <component id="acuagenttransport" filter="s60" name="ACU Agent Transport">
- <unit bldFile="vpnengine/acuagenttransport/group"/>
- </component>
- <component id="acupluginlib" filter="s60" name="ACU Plugin Library">
- <unit bldFile="vpnengine/acupluginlib/group"/>
+ <unit bldFile="vpnengine/vpnins/group" filter="!oem_build"/>
</component>
<component id="ikepolparser" filter="s60" name="IKE Policy Parser">
- <unit bldFile="vpnengine/ikepolparser/group"/>
+ <unit bldFile="vpnengine/ikepolparser/group" filter="!oem_build"/>
</component>
<component id="utlbase64" filter="s60" name="Base64 Utilities">
- <unit bldFile="vpnengine/utlbase64/group"/>
+ <unit bldFile="vpnengine/utlbase64/group" filter="!oem_build"/>
</component>
<component id="utlcrypto" filter="s60" name="Crypto Utilities">
- <unit bldFile="vpnengine/utlcrypto/group"/>
+ <unit bldFile="vpnengine/utlcrypto/group" filter="!oem_build"/>
</component>
<component id="utlxml" filter="s60" name="XML Utilities">
- <unit bldFile="vpnengine/utlxml/group"/>
+ <unit bldFile="vpnengine/utlxml/group" filter="!oem_build"/>
</component>
<component id="utlpkcs10" filter="s60" name="PKCS#10 Utilities">
- <unit bldFile="vpnengine/utlpkcs10/group"/>
- </component>
- <component id="pkiserviceapi" filter="s60" name="PKI Service API">
- <unit bldFile="vpnengine/pkiserviceapi/group"/>
+ <unit bldFile="vpnengine/utlpkcs10/group" filter="!oem_build"/>
</component>
- <component id="acuagentcrypto" filter="s60" name="ACU Agent Crypto">
- <unit bldFile="vpnengine/acuagentcrypto/group"/>
- </component>
- <component id="vpnextapi" filter="s60" name="VPN Extension API">
- <unit bldFile="vpnengine/vpnextapi/group"/>
+
+ <component id="pkiserviceapi" filter="s60" name="PKI Service API">
+ <unit bldFile="vpnengine/pkiserviceapi/group" filter="!oem_build"/>
</component>
<component id="ikecert" filter="s60" name="IKE Certificate Management">
- <unit bldFile="vpnengine/ikecert/group"/>
+ <unit bldFile="vpnengine/ikecert/group" filter="!oem_build"/>
</component>
<component id="kmdapi" filter="s60" name="Key Management Daemon API">
- <unit bldFile="vpnengine/kmdapi/group"/>
+ <unit bldFile="vpnengine/kmdapi/group" filter="!oem_build"/>
</component>
<component id="kmdserver" filter="s60" name="Key Management Daemon Server">
- <unit bldFile="vpnengine/kmdserver/group"/>
+ <unit bldFile="vpnengine/kmdserver/group" filter="!oem_build"/>
</component>
<component id="ikeutils" filter="s60" name="Internet Key Exchange Utils">
- <unit bldFile="vpnengine/ikeutils/group"/>
+ <unit bldFile="vpnengine/ikeutils/group" filter="!oem_build"/>
</component>
<component id="ikev1lib" filter="s60" name="IKEv1 Library">
- <unit bldFile="vpnengine/ikev1lib/group"/>
+ <unit bldFile="vpnengine/ikev1lib/group" filter="!oem_build"/>
</component>
<component id="ikev2lib" filter="s60" name="IKEv2 Library">
- <unit bldFile="vpnengine/ikev2lib/group"/>
- </component>
- <component id="acuagentmessage" filter="s60" name="ACU Agent Message">
- <unit bldFile="vpnengine/acuagentmessage/group"/>
- </component>
- <component id="acuagent" filter="s60" name="Automatic Content Update Agent">
- <unit bldFile="vpnengine/acuagent/group"/>
- </component>
- <component id="vpnawapi" filter="s60" name="VPN ACU Wrapper API">
- <unit bldFile="vpnengine/vpnawapi/group"/>
+ <unit bldFile="vpnengine/ikev2lib/group" filter="!oem_build"/>
</component>
<component id="vpnipsecpolparser" filter="s60" name="VPN IPsec Policy Parser">
- <unit bldFile="vpnengine/vpnipsecpolparser/group"/>
+ <unit bldFile="vpnengine/vpnipsecpolparser/group" filter="!oem_build"/>
</component>
<component id="sit" filter="s60" name="Socket Interaction Thread">
- <unit bldFile="vpnengine/sit/group"/>
+ <unit bldFile="vpnengine/sit/group" filter="!oem_build"/>
</component>
- <component id="acuins" filter="s60" name="ACU Installer">
- <unit bldFile="vpnengine/acuins/group"/>
- </component>
+
<component id="vpntcwrapper" filter="s60" name="VPN Terminal Control Wrapper">
- <unit bldFile="vpnengine/vpntcwrapper/group"/>
+ <unit bldFile="vpnengine/vpntcwrapper/group" filter="!oem_build"/>
</component>
<component id="eventmediator" filter="s60" name="Event Mediator">
- <unit bldFile="vpnengine/eventmediator/group"/>
- </component>
- <component id="ipsecacuplugin" filter="s60" name="IPsec ACU Plugin" class="plugin">
- <unit bldFile="vpnengine/ipsecacuplugin/group"/>
+ <unit bldFile="vpnengine/eventmediator/group" filter="!oem_build"/>
</component>
<component id="pkiservice" filter="s60" name="PKI Service">
- <unit bldFile="vpnengine/pkiservice/group"/>
+ <unit bldFile="vpnengine/pkiservice/group" filter="!oem_build"/>
</component>
<component id="vpnconnagt" filter="s60" name="VPN Connection Agent">
- <unit bldFile="vpnengine/vpnconnagt/group"/>
+ <unit bldFile="vpnengine/vpnconnagt/group" filter="!oem_build"/>
</component>
<component id="vpnmanager" filter="s60" name="VPN Manager">
- <unit bldFile="vpnengine/vpnmanager/group"/>
+ <unit bldFile="vpnengine/vpnmanager/group" filter="!oem_build"/>
</component>
<component id="vpncleaner" filter="s60" name="VPN Cleaner">
- <unit bldFile="vpnengine/vpncleaner/group"/>
+ <unit bldFile="vpnengine/vpncleaner/group" filter="!oem_build"/>
</component>
+
<component id="utlpkcs12" filter="s60" name="PKCS#12 Utilities">
- <unit bldFile="vpnengine/utlpkcs12/group"/>
+ <unit bldFile="vpnengine/utlpkcs12/group" filter="!oem_build"/>
</component>
<component id="dmadengine" filter="s60" name="DM Adapter Engine">
- <unit bldFile="vpnengine/dmadengine/group"/>
+ <unit bldFile="vpnengine/dmadengine/group" filter="!oem_build"/>
</component>
<component id="dmadipsecvpn" filter="s60" name="IPsec VPN DM Adapter" class="plugin">
- <unit bldFile="vpnengine/dmadipsecvpn/group"/>
+ <unit bldFile="vpnengine/dmadipsecvpn/group" filter="!oem_build"/>
</component>
<component id="dmadpki" filter="s60" name="PKI DM Adapter" class="plugin">
- <unit bldFile="vpnengine/dmadpki/group"/>
+ <unit bldFile="vpnengine/dmadpki/group" filter="!oem_build"/>
</component>
- <component id="ikesocketplugin" filter="s60" name="IKE Socket Plugin" class="plugin">
- <unit bldFile="vpnengine/ikesocketplugin/group"/>
+ <component id="ikesocket" filter="s60" name="IKE Socket" introduced="^3">
+ <unit bldFile="vpnengine/ikesocketplugin/group" filter="!oem_build"/>
</component>
- <component id="vpnnif" filter="s60" name="VPN NIF"/>
</collection>
<collection id="vpnui" name="VPN UI" level="ui">
<component id="vpnecomnotifier" filter="s60" name="VPN ECOM Notifier" class="plugin">
- <unit bldFile="vpnui/vpnecomnotifier/group"/>
+ <unit bldFile="vpnui/vpnecomnotifier/group" filter="!oem_build"/>
</component>
<component id="vpndialogmanager" filter="s60" name="VPN Dialog Manager">
- <unit bldFile="vpnui/vpndialogmanager/group"/>
+ <unit bldFile="vpnui/vpndialogmanager/group" filter="!oem_build"/>
</component>
<component id="vpnmanagementui" filter="s60" name="VPN Management UI" class="plugin">
- <unit bldFile="vpnui/vpnmanagementui/group"/>
+ <unit bldFile="vpnui/vpnmanagementui/group" filter="!oem_build"/>
</component>
<component id="vpnpolins" filter="s60" name="VPN Policy Installer">
- <unit bldFile="vpnui/vpnpolins/group"/>
+ <unit bldFile="vpnui/vpnpolins/group" filter="!oem_build"/>
</component>
<component id="vpnpolicyrecognizer" filter="s60" name="VPN Policy Recognizer" class="plugin">
- <unit bldFile="vpnui/vpnpolicyrecognizer/group"/>
- </component>
- </collection>
- <collection id="vpnapiimpl" name="VPN API Implementation" level="api">
- <component id="vpnapi" filter="s60" name="VPN API">
- <unit bldFile="vpnapiimpl/group"/>
- </component>
- </collection>
- <collection id="vpnclient_sis" name="VPN Client SIS" level="api">
- <component id="ce_sis" filter="s60" name="CE SIS">
- <unit bldFile="vpnclient_sis/ce_sis/group"/>
- </component>
- <component id="stub_sis" filter="s60" name="Stub SIS">
- <unit bldFile="vpnclient_sis/stub_sis/group"/>
- </component>
- <component id="vpnclient_sis_build" filter="s60" name="VPN Client SIS Build">
- <unit bldFile="vpnclient_sis/group"/>
+ <unit bldFile="vpnui/vpnpolicyrecognizer/group" filter="!oem_build"/>
</component>
</collection>
<collection id="vpnclient_info" name="VPN Client Info" level="api">
<component id="vpnclient_help" filter="s60" name="VPN Client Help">
- <unit bldFile="help/group"/>
+ <unit bldFile="help/group" filter="!oem_build"/>
</component>
<component id="vpnclient_build" filter="s60" name="VPN Client Build">
- <!-- should split this up into the other components-->
- <unit bldFile="group"/>
+ <!-- should split this up into the other components and remove this-->
+ <unit bldFile="group" filter="!oem_build"/>
</component>
<component id="vpnc_plat" filter="s60" class="api" name="VPN Client Platform Interfaces">
- <unit bldFile="vpnc_plat/vpnapi/group"/>
+ <unit bldFile="vpnc_plat/vpnapi/group" filter="!oem_build"/>
</component>
</collection>
</package>
--- a/symbian3/mw/web/package_definition_3.0.xml Wed Feb 03 19:36:09 2010 +0000
+++ b/symbian3/mw/web/package_definition_3.0.xml Wed Feb 03 20:06:22 2010 +0000
@@ -2,20 +2,16 @@
<SystemDefinition schema="3.0.0">
<package id="web" name="Web" levels="plugin utils server generic specific">
<collection id="web_info" name="Web Info" level="specific">
+ <component id="web_plat" filter="s60" name="Web Platform Interfaces" class="api">
+ <unit bldFile="web_plat/group"/>
+ </component>
<component id="web_pub" filter="s60" name="Web Public Interfaces" class="api">
<unit bldFile="web_pub/group"/>
- <!-- can these be #included in the above bld.inf? -->
- <!-- <unit bldFile="web_pub/browser_control_api/tsrc/group"/> -->
- <!-- <unit bldFile="web_pub/download_mgr_client_api/tsrc/group"/> -->
- <!-- <unit bldFile="web_pub/favourites_engine_api/tsrc/group"/> -->
</component>
<component id="web_build" filter="s60" name="Web Build">
- <!-- if the #ifdef can be moved out of here, this can be removed -->
+ <!-- when configuration is in place, the #ifdef is no longer needed and this component can be removed -->
<unit bldFile="group"/>
</component>
- <component id="web_plat" filter="s60" name="Web Platform Interfaces" class="api">
- <unit bldFile="web_plat/group"/>
- </component>
</collection>
<collection id="browserutilities" name="Browser Utilities" level="utils">
<component id="browserdialogsprovider" filter="s60" name="Browser Dialogs Provider">
@@ -44,25 +40,25 @@
</component>
<component id="feedsengine" filter="s60" name="Feeds Engine">
<unit bldFile="browserutilities/feedsengine/group"/>
- <!-- should this test be #included in the above bld.inf? -->
- <!-- <unit bldFile="browserutilities/feedsengine/feedsserver/reconizer/group"/> -->
</component>
<component id="multipartparser" filter="s60" name="Multipart Parser">
- <unit bldFile="browserutilities/multipartparser/group"/>
+ <meta rel="config">
+ <defined condition="BRDO_MULTIPART_PARSER_FF"/>
+ </meta>
+ <!-- uncomment the unit when configuration is in place, it's currently #included from browserutilities_build -->
+ <!-- <unit bldFile="browserutilities/multipartparser/group"/> -->
</component>
<component id="schemehandler" filter="s60" name="Scheme Handler">
<unit bldFile="browserutilities/schemehandler/group"/>
</component>
<component id="webutils" filter="s60" name="Web Utils">
<unit bldFile="browserutilities/webutils/group"/>
- <!-- should this test be #included in the above bld.inf? -->
- <!-- <unit bldFile="browserutilities/webutils/tsrc/public/adv/group"/> -->
</component>
<component id="aiwbrowserprovider" filter="s60" name="AIW Browser Provider" class="plugin">
<unit bldFile="browserutilities/aiwbrowserprovider/group"/>
</component>
<component id="browserutilities_build" filter="s60" name="Browser Utilities Build">
- <!-- this can be removed if the #ifdef is moved into the multipart bld.inf -->
+ <!-- when configuration is in place, the #ifdef is no longer needed and this component can be removed -->
<unit bldFile="browserutilities/group"/>
</component>
</collection>
@@ -74,8 +70,6 @@
<unit bldFile="webengine/osswebengine/npscript/group"/>
<unit bldFile="webengine/osswebengine/webkit/s60/group"/>
<unit bldFile="webengine/osswebengine/webkit/s60/group/javascriptcore"/>
- <!-- <unit bldFile="webengine/osswebengine/webkit/s60/webview/webview_api_test/group"/> -->
- <!-- <unit bldFile="webengine/osswebengine/webkit/s60/webview/webview_api_test/tsrc/group"/> -->
</component>
<component id="webkitutils" filter="s60" name="WebKit Utils">
<unit bldFile="webengine/webkitutils/group"/>
@@ -88,8 +82,6 @@
</component>
<component id="widgetregistry" filter="s60" name="Widget Registry">
<unit bldFile="webengine/widgetregistry/group"/>
- <!-- should this test be #included in the above bld.inf? -->
- <!-- <unit bldFile="webengine/widgetregistry/tsrc/public/basic/group"/> -->
</component>
<component id="wmlengine" filter="s60" name="WML Engine">
<unit bldFile="webengine/wmlengine/group"/>
@@ -101,7 +93,6 @@
<component id="widgetengine" filter="s60" name="Widget Engine">
<unit bldFile="webengine/widgetengine/group"/>
</component>
- <!--Component manually removed as empty and name conflicts with another component-->
<component id="web_memoryplugin" name="Memory Plugin" filter="s60" class="plugin">
<unit bldFile="webengine/memoryplugin/group"/>
</component>
@@ -117,10 +108,6 @@
<component id="wrtharvester" filter="s60" name="Web Runtime Harvester" class="plugin">
<unit bldFile="webengine/wrtharvester/group"/>
</component>
- <component id="webengine_build" filter="s60" name="Web Engine Build">
- <!-- should be able to break this up into the above bld.infs -->
- <unit bldFile="webengine/group"/>
- </component>
</collection>
<collection id="codhandler" name="Content Object Descriptor Handler" level="specific">
<component id="codeng" filter="s60" name="COD Engine">
@@ -148,31 +135,61 @@
<unit bldFile="codhandler/roapapp/group"/>
</component>
<component id="codhandler_build" filter="s60" name="COD Handler Build">
- <!-- is there another component these exports can go into? -->
+ <!-- Exports need to go into another component or make this self-contained.
+ #included .hrh file needs to be #included in each of the other components -->
<unit bldFile="codhandler/group"/>
</component>
</collection>
<collection id="widgets" name="Web Widget Framework" level="generic">
+ <meta rel="config">
+ <defined condition="RD_BROWSER_WIDGETS"/>
+ </meta>
+ <!-- the following units can be uncommented when configuration is put in place -->
<component id="widgetrecognizer" filter="s60" name="Widget Recognizer" class="plugin">
- <unit bldFile="widgets/widgetrecognizer/group"/>
+ <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">
- <unit bldFile="widgets/widgetinstaller/group"/>
+ <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">
- <unit bldFile="widgets/widgetapp/group"/>
+ <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">
- <unit bldFile="widgets/widgetpreinstaller/group"/>
+ <meta rel="config">
+ <defined condition="RD_WIDGET_PREINSTALLER"/>
+ </meta>
+ <!--<unit bldFile="widgets/widgetpreinstaller/group"/>-->
</component>
<component id="widgetstartup" filter="s60" name="Widget Startup">
- <unit bldFile="widgets/widgetstartup/group"/>
+ <meta rel="config">
+ <defined condition="RD_WIDGET_PREINSTALLER"/>
+ </meta>
+ <!--<unit bldFile="widgets/widgetstartup/group"/>-->
</component>
<component id="widgets_build" filter="s60" name="Widgets Build">
- <!-- can this be broken up into the above components? -->
+ <!-- when configuration is in place, the #ifdef is no longer needed and this component can be removed
+ #included .hrh file needs to be #included in each of the other components -->
<unit bldFile="widgets/group"/>
</component>
</collection>
--- a/symbian3/mw/websrv/package_definition_3.0.xml Wed Feb 03 19:36:09 2010 +0000
+++ b/symbian3/mw/websrv/package_definition_3.0.xml Wed Feb 03 20:06:22 2010 +0000
@@ -21,33 +21,36 @@
<component id="wsdescription" filter="s60" name="WS Service Description">
<unit bldFile="webservices/wsdescription/group"/>
</component>
- <component id="wshttpchanneltransportplugin" filter="s60" name="WS HTTP Channel Transport Plugin" class="plugin">
- <unit bldFile="webservices/wshttpchanneltransportplugin/group"/>
- </component>
<component id="wsconnection" filter="s60" name="WS Service Connection">
<unit bldFile="webservices/wsconnection/group"/>
</component>
- <component id="wshostletconnection" filter="s60" name="WS Hostlet Connection">
- <unit bldFile="webservices/wshostletconnection/group"/>
+ <component id="wsmessages" filter="s60" name="WS Messages">
+ <unit bldFile="webservices/wsmessages/group"/>
</component>
<component id="wscredentialmanager" filter="s60" name="WS Credential Manager">
<unit bldFile="webservices/wscredentialmanager/group"/>
</component>
+ <component id="wsframework" filter="s60" name="WS Framework">
+ <unit bldFile="webservices/wsframework/group"/>
+ </component>
+ <component id="wshttpchanneltransportplugin" filter="s60" name="WS HTTP Channel Transport Plugin" class="plugin">
+ <unit bldFile="webservices/wshttpchanneltransportplugin/group"/>
+ </component>
+ <component id="wsconnectionagent" filter="s60" name="WS Connection Agent">
+ <unit bldFile="webservices/wsconnectionagent/group"/>
+ </component>
+ <component id="wsprovider" filter="s60" name="WS Provider">
+ <unit bldFile="webservices/wsprovider/group"/>
+ </component>
+ <component id="wshostletconnection" filter="s60" name="WS Hostlet Connection">
+ <unit bldFile="webservices/wshostletconnection/group"/>
+ </component>
<component id="wsmanager" filter="s60" name="WS Service Manager">
<unit bldFile="webservices/wsmanager/group"/>
</component>
<component id="wsidentitymanager" filter="s60" name="WS Identity Manager">
<unit bldFile="webservices/wsidentitymanager/group"/>
</component>
- <component id="wsframework" filter="s60" name="WS Framework">
- <unit bldFile="webservices/wsframework/group"/>
- </component>
- <component id="wsmessages" filter="s60" name="WS Messages">
- <unit bldFile="webservices/wsmessages/group"/>
- </component>
- <component id="wsconnectionagent" filter="s60" name="WS Connection Agent">
- <unit bldFile="webservices/wsconnectionagent/group"/>
- </component>
<component id="idwsfplugin" filter="s60" name="ID-WSF Plugin" class="plugin">
<unit bldFile="webservices/idwsfplugin/group"/>
</component>
@@ -66,9 +69,6 @@
<component id="wscore" filter="s60" name="WS Core Service Manager">
<unit bldFile="webservices/wscore/group"/>
</component>
- <component id="wsprovider" filter="s60" name="WS Provider">
- <unit bldFile="webservices/wsprovider/group"/>
- </component>
<component id="wslocaltransportplugin" filter="s60" name="WS Local Transport Plugin" class="plugin">
<unit bldFile="webservices/wslocaltransportplugin/group"/>
</component>
@@ -76,51 +76,29 @@
<unit bldFile="webservices/wshostlettransportplugin/group"/>
</component>
<component id="wsstar" filter="s60" name="WS Star">
- <!-- <unit bldFile="webservices/wsstar/group"/> -->
+ <!-- can only have one unit. Need to split into separate components or #include from a single bld.inf -->
+ <unit bldFile="webservices/wsstar/wsstarpolicy/group"/>
+ <unit bldFile="webservices/wsstar/wsstarplugin/group"/>
+ <unit bldFile="webservices/wsstar/wsstarmessagehandlers/group"/>
</component>
<component id="wsoviplugin" filter="s60" name="WS Ovi Plugin">
<unit bldFile="webservices/wsoviplugin/group"/>
</component>
+ <component id="wsoviplugin" filter="s60" name="WS Ovi Plugin">
+ <unit bldFile="webservices/wsoviplugin/group"/>
+ </component>
<component id="webservices_build" filter="s60" name="Web Services Build">
+ <!-- need to split into self-contained components -->
<unit bldFile="webservices/group"/>
</component>
</collection>
<collection id="websrv_info" name="Web Services Info" level="specific">
+ <component id="websrv_bld" filter="s60" name="Web Services Build">
+ <!-- need to include common .hrh in each unit -->
+ <unit bldFile="group"/>
+ </component>
<component id="websrv_pub" filter="s60" name="Web Services Public Interfaces" class="api">
<unit bldFile="websrv_pub/group"/>
- <!-- should these be #included? -->
- <!-- <unit bldFile="websrv_pub/hostlet_connection_api/tsrc/bc/hostconn/group"/> -->
- <!-- <unit bldFile="websrv_pub/hostlet_connection_api/tsrc/group"/> -->
- <!-- <unit bldFile="websrv_pub/hostlet_connection_api/tsrc/hostconn/group"/> -->
- <!-- <unit bldFile="websrv_pub/hostlet_connection_api/tsrc/hostconntester/group"/> -->
- <!-- <unit bldFile="websrv_pub/web_service_connection_api/tsrc/bc/connection/group"/> -->
- <!-- <unit bldFile="websrv_pub/web_service_connection_api/tsrc/bc/senutils/group"/> -->
- <!-- <unit bldFile="websrv_pub/web_service_connection_api/tsrc/connection/group"/> -->
- <!-- <unit bldFile="websrv_pub/web_service_connection_api/tsrc/group"/> -->
- <!-- <unit bldFile="websrv_pub/web_service_connection_api/tsrc/senconnectiontester/group"/> -->
- <!-- <unit bldFile="websrv_pub/web_service_connection_api/tsrc/senconnectiontimeoutstester/group"/> -->
- <!-- <unit bldFile="websrv_pub/web_service_connection_api/tsrc/senlayeredpropertiestester/group"/> -->
- <!-- <unit bldFile="websrv_pub/web_service_connection_api/tsrc/senutils/group"/> -->
- <!-- <unit bldFile="websrv_pub/web_service_connection_api/tsrc/senutilstestcases/group"/> -->
- <!-- <unit bldFile="websrv_pub/web_service_connection_api/tsrc/wspolicytester/group"/> -->
- <!-- <unit bldFile="websrv_pub/web_service_connection_api/tsrc/wsstarmessagehandlertester/group"/> -->
- <!-- <unit bldFile="websrv_pub/web_service_description_api/tsrc/bc/senservdesc/group"/> -->
- <!-- <unit bldFile="websrv_pub/web_service_description_api/tsrc/group"/> -->
- <!-- <unit bldFile="websrv_pub/web_service_description_api/tsrc/senservdesc/group"/> -->
- <!-- <unit bldFile="websrv_pub/web_service_description_api/tsrc/senservdesctester/group"/> -->
- <!-- <unit bldFile="websrv_pub/web_service_manager_api/tsrc/bc/senservicemanager/group"/> -->
- <!-- <unit bldFile="websrv_pub/web_service_manager_api/tsrc/group"/> -->
- <!-- <unit bldFile="websrv_pub/web_service_manager_api/tsrc/senservicemanager/group"/> -->
- <!-- <unit bldFile="websrv_pub/web_service_manager_api/tsrc/senservicemanagertester/group"/> -->
- <!-- <unit bldFile="websrv_pub/web_service_messaging_api/tsrc/bc/newsoapclasses/group"/> -->
- <!-- <unit bldFile="websrv_pub/web_service_messaging_api/tsrc/group"/> -->
- <!-- <unit bldFile="websrv_pub/web_service_messaging_api/tsrc/newsoapclasses/group"/> -->
- <!-- <unit bldFile="websrv_pub/web_service_messaging_api/tsrc/newsoapclassestester/group"/> -->
- <!-- <unit bldFile="websrv_pub/xml_extensions_api/tsrc/group"/> -->
- <!-- <unit bldFile="websrv_pub/xml_extensions_api/tsrc/senxml/group"/> -->
- <!-- <unit bldFile="websrv_pub/xml_extensions_api/tsrc/senxmltester/group"/> -->
- <!-- <unit bldFile="websrv_pub/xml_fragment_api/tsrc/group"/> -->
- <!-- <unit bldFile="websrv_pub/xml_fragment_api/tsrc/senfragmenttester/group"/> -->
</component>
</collection>
</package>
--- a/symbian3/os/bt/package_definition_3.0.xml Wed Feb 03 19:36:09 2010 +0000
+++ b/symbian3/os/bt/package_definition_3.0.xml Wed Feb 03 20:06:22 2010 +0000
@@ -70,6 +70,12 @@
<unit mrp="bluetoothapitest/bluetoothsvs/group/bluetoothsvs.mrp" bldFile="bluetoothapitest/bluetoothsvs/group"/>
</component>
</collection>
+ <collection id="atext" name="AT Extensions" level="server">
+ <!-- collection is really a component. Need to move down a directory -->
+ <component id="atext_build" name="AT Extension Build" introduced="^3" purpose="optional" filter="s60">
+ <unit bldFile="atext/group"/>
+ </component>
+ </collection>
<collection id="bt_info" name="Bluetooth Info" level="app-if">
<component id="bt_plat" filter="s60" class="api">
<unit bldFile="bt_plat/group"/>
--- a/symbian3/os/deviceplatformrelease/package_definition_3.0.xml Wed Feb 03 19:36:09 2010 +0000
+++ b/symbian3/os/deviceplatformrelease/package_definition_3.0.xml Wed Feb 03 20:06:22 2010 +0000
@@ -2,35 +2,91 @@
<SystemDefinition schema="3.0.0">
<package id="deviceplatformrelease" name="Device Platform Release" levels="bld mid top">
<collection id="s60extras" name="S60 Extras" level="mid">
+ <!-- collection is really a component. Need to move down a directory -->
<component id="s60extras_build" filter="s60" name="S60 Extras Build" class="config" purpose="development">
<unit bldFile="s60extras/group"/>
</component>
</collection>
- <collection id="s60locfiles" name="S60 Locale Files" level="mid">
- <component id="s60locfiles_build" filter="s60" name="S60 Locale Files Build" class="config" purpose="development">
+ <collection id="locfiles" name="Locale Files" level="mid">
+ <component id="locfiles_build" filter="s60" name="S60 Locale Files Build" class="config" purpose="development">
+ <!-- need to move component down a directory -->
<unit bldFile="s60locfiles/group"/>
</component>
+ <component id="locfiles_set1" name="Locale Files Set 1" class="config" filter="s60">
+ <unit unitID="platform.locfiles.set1" bldFile="locfiles/group/set1" />
+ </component>
+ <component id="locfiles_set2" name="Locale Files Set 2" class="config" filter="s60">
+ <unit unitID="platform.locfiles.set2" bldFile="locfiles/group/set2" />
+ </component>
+ <component id="locfiles_set3" name="Locale Files Set 3" class="config" filter="s60">
+ <unit unitID="platform.locfiles.set3" bldFile="locfiles/group/set3" />
+ </component>
+ <component id="locfiles_set4" name="Locale Files Set 4" class="config" filter="s60">
+ <unit unitID="platform.locfiles.set4" bldFile="locfiles/group/set4" />
+ </component>
+ <component id="locfiles_set5" name="Locale Files Set 5" class="config" filter="s60">
+ <unit unitID="platform.locfiles.set5" bldFile="locfiles/group/set5" />
+ </component>
+ <component id="locfiles_set6" name="Locale Files Set 6" class="config" filter="s60">
+ <unit unitID="platform.locfiles.set6" bldFile="locfiles/group/set6" />
+ </component>
+ <!-- is the a problem with SF builds with the following? -->
+ <component id="locfiles_set7" name="Locale Files Set 7" class="config" filter="s60">
+ <unit unitID="platform.locfiles.set7" bldFile="locfiles/group/set7" />
+ </component>
+ <component id="locfiles_set8" name="Locale Files Set 8" class="config" filter="s60">
+ <unit unitID="platform.locfiles.set8" bldFile="locfiles/group/set8" />
+ </component>
+ <component id="locfiles_set9" name="Locale Files Set 9" class="config" filter="s60">
+ <unit unitID="platform.locfiles.set9" bldFile="locfiles/group/set9" />
+ </component>
+ <component id="locfiles_set10" name="Locale Files Set 10" class="config" filter="s60">
+ <unit unitID="platform.locfiles.set10" bldFile="locfiles/group/set10" />
+ </component>
+ <component id="locfiles_set11" name="Locale Files Set 11" class="config" filter="s60">
+ <unit unitID="platform.locfiles.set11" bldFile="locfiles/group/set11" />
+ </component>
+ <component id="locfiles_set12" name="Locale Files Set 12" class="config" filter="s60">
+ <unit unitID="platform.locfiles.set12" bldFile="locfiles/group/set12" />
+ </component>
+ <component id="locfiles_set13" name="Locale Files Set 13" class="config" filter="s60">
+ <unit unitID="platform.locfiles.set13" bldFile="locfiles/group/set13" />
+ </component>
+ <component id="locfiles_set14" name="Locale Files Set 14" class="config" filter="s60">
+ <unit unitID="platform.locfiles.set14" bldFile="locfiles/group/set14" />
+ </component>
+ <component id="locfiles_set15" name="Locale Files Set 15" class="config" filter="s60">
+ <unit unitID="platform.locfiles.set15" bldFile="locfiles/group/set15" />
+ </component>
+ <component id="locfiles_set16" name="Locale Files Set 16" class="config" filter="s60">
+ <unit unitID="platform.locfiles.set16" bldFile="locfiles/group/set16" />
+ </component>
</collection>
<collection id="version" name="Version" level="top">
+ <!-- collection is really a component. Need to move down a directory -->
<component id="version_build" filter="s60" name="Version Build" class="config" purpose="development">
<unit bldFile="version/group"/>
</component>
</collection>
+
+ <collection id="helps_loc2" name="Helps Locale 2" level="top">
+ <!-- collection is really a component. Need to move down a directory -->
+ <component id="helps_loc2_build" name="Helps Locale 2 Build" filter="s60">
+ <unit bldFile="helps_loc2/group"/>
+ </component>
+ </collection>
+
<collection id="sf_config" name="SF Config" level="mid">
<component id="config" filter="s60" name="Config" class="config" purpose="development">
- <!-- there should only be one unit. Can any of these be uncommented? -->
- <!-- <unit bldFile="sf_config/config/apac/group"/> -->
- <!-- <unit bldFile="sf_config/config/group"/> -->
- <!-- <unit bldFile="sf_config/config/japan/group"/> -->
- <!-- <unit bldFile="sf_config/config/western/group"/> -->
+ <unit base="sf_config/config"/>
</component>
</collection>
+ <!-- should be located locally in buildplatforms/group
<collection id="s60bld" name="S60 Build">
<component id="buildplatforms" filter="s60" name="Build Platforms">
- <!-- should be located locally in buildplatforms/group -->
<unit bldFile="/tools/buildplatforms/group"/>
</component>
- </collection>
+ </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"/>
@@ -38,7 +94,7 @@
<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" purpose="development" target="desktop">
+ <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>
--- a/symbian3/os/devicesrv/package_definition_3.0.xml Wed Feb 03 19:36:09 2010 +0000
+++ b/symbian3/os/devicesrv/package_definition_3.0.xml Wed Feb 03 20:06:22 2010 +0000
@@ -4,77 +4,38 @@
<collection id="accessoryservices" name="Accessory Services" level="framework">
<component id="accessorymonitor" filter="s60" name="Accessory Monitor">
<unit bldFile="accessoryservices/accessorymonitor/group"/>
- <!-- are these test bld.infs needed for the build? -->
- <!-- <unit bldFile="accessoryservices/accessorymonitor/tsrc/public/basic/accmonconnectionemulator/group"/> -->
- <!-- <unit bldFile="accessoryservices/accessorymonitor/tsrc/public/basic/accmonitoringtestmodule/group"/> -->
- <!-- <unit bldFile="accessoryservices/accessorymonitor/tsrc/public/basic/accmonitoringtestmodule/tests/group"/> -->
- <!-- <unit bldFile="accessoryservices/accessorymonitor/tsrc/public/basic/accmontesttimer/group"/> -->
- <!-- <unit bldFile="accessoryservices/accessorymonitor/tsrc/public/basic/group"/> -->
- <!-- <unit bldFile="accessoryservices/accessorymonitor/tsrc/public/basic/stubs/accfwuinotifierstub/group"/> -->
- <!-- <unit bldFile="accessoryservices/accessorymonitor/tsrc/public/basic/stubs/asystub/group"/> -->
- <!-- <unit bldFile="accessoryservices/accessorymonitor/tsrc/public/basic/stubs/group"/> -->
</component>
<component id="accessoryremotecontrol" filter="s60" name="Accessory Remote Control">
<unit bldFile="accessoryservices/accessoryremotecontrol/group"/>
- <!-- are these test bld.infs needed for the build? -->
- <!-- <unit bldFile="accessoryservices/accessoryremotecontrol/tsrc/dsytesttool/dosservercontrol/group"/> -->
- <!-- <unit bldFile="accessoryservices/accessoryremotecontrol/tsrc/dsytesttool/dsytfcore/group"/> -->
- <!-- <unit bldFile="accessoryservices/accessoryremotecontrol/tsrc/dsytesttool/dsytfstifadapter/group"/> -->
- <!-- <unit bldFile="accessoryservices/accessoryremotecontrol/tsrc/dsytesttool/group"/> -->
- <!-- <unit bldFile="accessoryservices/accessoryremotecontrol/tsrc/remcontestcontrol/group"/> -->
- <!-- <unit bldFile="accessoryservices/accessoryremotecontrol/tsrc/stub/audio/group"/> -->
- <!-- <unit bldFile="accessoryservices/accessoryremotecontrol/tsrc/stub/group"/> -->
- <!-- <unit bldFile="accessoryservices/accessoryremotecontrol/tsrc/stub/phone/group"/> -->
- <!-- <unit bldFile="accessoryservices/accessoryremotecontrol/tsrc/stub/remcon/group"/> -->
</component>
<component id="accessoryserver" filter="s60" name="Accessory Server">
<unit bldFile="accessoryservices/accessoryserver/group"/>
- <!-- are these test bld.infs needed for the build? -->
- <!-- <unit bldFile="accessoryservices/accessoryserver/tsrc/dsytesttool/dosservercontrol/group"/> -->
- <!-- <unit bldFile="accessoryservices/accessoryserver/tsrc/dsytesttool/dsytfcore/group"/> -->
- <!-- <unit bldFile="accessoryservices/accessoryserver/tsrc/dsytesttool/dsytfstifadapter/group"/> -->
- <!-- <unit bldFile="accessoryservices/accessoryserver/tsrc/dsytesttool/group"/> -->
- <!-- <unit bldFile="accessoryservices/accessoryserver/tsrc/public/basic/accessorytestcontrol/group"/> -->
- <!-- <unit bldFile="accessoryservices/accessoryserver/tsrc/public/basic/group"/> -->
- <!-- <unit bldFile="accessoryservices/accessoryserver/tsrc/public/basic/stubs/accfwuinotifierstub/group"/> -->
- <!-- <unit bldFile="accessoryservices/accessoryserver/tsrc/public/basic/stubs/asystub/group"/> -->
- <!-- <unit bldFile="accessoryservices/accessoryserver/tsrc/public/basic/stubs/btasystub/group"/> -->
- <!-- <unit bldFile="accessoryservices/accessoryserver/tsrc/public/basic/stubs/group"/> -->
+ </component>
+ <component id="pluggeddisplay" filter="s60" name="Plugged Display" introduced="^3">
+ <unit bldFile="accessoryservices/pluggeddisplay/group"/>
</component>
<component id="headsetstatusapi" filter="s60" name="Headset Status API">
<unit bldFile="accessoryservices/headsetstatusapi/group"/>
- <!-- is this test bld.inf needed for the build? -->
- <!-- <unit bldFile="accessoryservices/headsetstatusapi/tsrc/public/basic/group"/> -->
</component>
<component id="tspclientmapper" filter="s60" name="TSP Client Mapper">
<unit bldFile="accessoryservices/tspclientmapper/group"/>
- <!-- is this test bld.inf needed for the build? -->
- <!-- <unit bldFile="accessoryservices/tspclientmapper/tsrc/public/basic/group"/> -->
</component>
<component id="remotecontrolfw" name="Remote Control Framework" introduced="9.1" purpose="optional">
<unit bldFile="accessoryservices/remotecontrolfw/group" mrp="accessoryservices/remotecontrolfw/group/bluetooth_remotecontrol.mrp"/>
</component>
<component id="gid_pc_tool" filter="s60" name="Generic ID PC Tool" target="desktop" class="tool">
- <unit bldFile="accessoryservices/gid_pc_tool/group"/>
+ <unit bldFile="accessoryservices/gid_pc_tool/group"/>
</component>
</collection>
<collection id="commonservices" name="Common Services" level="app-if">
<component id="commonengine" filter="s60" name="Common Engine">
<unit bldFile="commonservices/commonengine/group"/>
- <!-- is this test bld.inf needed for the build? -->
- <!-- <unit bldFile="commonservices/commonengine/tsrc/public/basic/group"/> -->
</component>
<component id="commonengineresources" filter="s60" name="Common Engine Resources" class="config">
<unit bldFile="commonservices/commonengineresources/group"/>
</component>
<component id="platformenv" filter="s60" name="Platform Environment">
<unit bldFile="commonservices/platformenv/group"/>
- <!-- <unit bldFile="commonservices/platformenv/disknotifyhandler/group"/> -->
- <!-- are these bld.infs needed? Can they be included from bld.inf?-->
- <!-- <unit bldFile="commonservices/platformenv/platformver/group"/> -->
- <!-- <unit bldFile="commonservices/platformenv/sysversioninfo/group"/> -->
- <!-- is this test bld.inf needed for the build? -->
- <!-- <unit bldFile="commonservices/platformenv/tsrc/public/basic/group"/> -->
</component>
<component id="sysutil" name="System Utilities" purpose="mandatory" introduced="ER5">
<unit bldFile="commonservices/sysutil/group" mrp="commonservices/sysutil/group/sysutil.mrp"/>
@@ -84,80 +45,25 @@
</component>
</collection>
<collection id="dosservices" name="Domestic Operating System Services" level="hw-if">
- <component id="dosserver" filter="s60" name="Domestic OS Server">
- <unit bldFile="dosservices/dosserver/group"/>
- </component>
<component id="commondsy" filter="s60" name="Common DSY" class="plugin">
<unit bldFile="dosservices/commondsy/group"/>
</component>
- <component id="dosservices_test" filter="s60" purpose="development" name="DOS Services Test">
- <!-- is this component needed? If so, can these be #included from a single master test bld.inf?-->
- <!-- <unit bldFile="dosservices/tsrc/dsytesttool/dosservercontrol/group"/> -->
- <!-- <unit bldFile="dosservices/tsrc/public/basic/stubs/dsystub/group"/> -->
- <!-- <unit bldFile="dosservices/tsrc/public/basic/group"/> -->
- <!-- <unit bldFile="dosservices/tsrc/dsytesttool/dsytfcore/group"/> -->
- <!-- <unit bldFile="dosservices/tsrc/public/basic/dosservertestplugin/group"/> -->
- <!-- <unit bldFile="dosservices/tsrc/dsytesttool/dsytfstifadapter/group"/> -->
- <!-- <unit bldFile="dosservices/tsrc/dsytesttool/group"/> -->
+ <component id="dosserver" filter="s60" name="Domestic OS Server">
+ <unit bldFile="dosservices/dosserver/group"/>
</component>
</collection>
- <collection id="resourcemgmt" name="Resource Management" level="hw-if">
- <component id="serverexe" filter="s60" name="Hardware Resource Manager Server">
- <!-- this needs to be resolved with the equivalent in the hwresourcesmgr component -->
- <!-- <unit bldFile="resourcemgmt/serverexe/group"/> -->
- </component>
- <component id="hwrmfmtxwatcherplugin" filter="s60" name="HWRM FM Transmitter Watcher Plugin" class="plugin">
- <!-- this needs to be resolved with the equivalent in the hwresourcesmgr component. Should this be purpose="development" -->
- <!-- <unit bldFile="resourcemgmt/hwrmfmtxwatcherplugin/group"/> -->
- </component>
- <component id="clientdll" filter="s60" name="HWRM Client">
- <!-- this needs to be resolved with the equivalent in the hwresourcesmgr component -->
- <!-- <unit bldFile="resourcemgmt/clientdll/group"/> -->
- </component>
- <component id="commondll" filter="s60" name="HWRM Common">
- <!-- this needs to be resolved with the equivalent in the hwresourcesmgr component -->
- <!-- <unit bldFile="resourcemgmt/commondll/group"/> -->
- </component>
- <component id="vibraclientdll" filter="s60" name="Vibra Client">
- <!-- this needs to be resolved with the equivalent in the hwresourcesmgr component -->
- <!-- <unit bldFile="resourcemgmt/vibraclientdll/group"/> -->
- </component>
- <component id="extendedlightclientdll" filter="s60" name="Extended Light Client">
- <!-- this needs to be resolved with the equivalent in the hwresourcesmgr component -->
- <!-- <unit bldFile="resourcemgmt/extendedlightclientdll/group"/> -->
- </component>
- <component id="lightclientdll" filter="s60" name="Light Client">
- <!-- this needs to be resolved with the equivalent in the hwresourcesmgr component -->
- <!-- <unit bldFile="resourcemgmt/lightclientdll/group"/> -->
+ <collection id="sensorservices" name="Sensor Services" level="framework">
+ <component id="sensorserver" filter="s60" name="Sensor Server">
+ <unit bldFile="sensorservices/sensorserver/group"/>
</component>
- <component id="fmtxclientdll" filter="s60" name="FM Transmitter Client">
- <!-- this needs to be resolved with the equivalent in the fmtransmittercontrol component -->
- <!-- <unit bldFile="resourcemgmt/fmtxclientdll/group"/> -->
- </component>
- <component id="hwrmtargetmodifierplugin" filter="s60" name="HWRM Target Modifier Plugin" class="plugin">
- <!-- this needs to be resolved with the equivalent in the hwresourcesmgr component. Should this be purpose="development" -->
- <!-- <unit bldFile="resourcemgmt/hwrmtargetmodifierplugin/group"/> -->
- <!-- <unit bldFile="resourcemgmt/hwrmtargetmodifierplugin/tsrc/hwrmtargetmodifierplugintest/group"/> -->
- </component>
- <component id="vibractrl" filter="s60" name="Vibra Control" deprecated="9.1">
- <unit bldFile="resourcemgmt/vibractrl/group"/>
+ <component id="orientationssy" filter="s60" name="Orientation SSY" class="plugin">
+ <unit bldFile="sensorservices/orientationssy/group"/>
</component>
- <component id="hwresourcesmgr" name="Hardware Resources Manager" introduced="^2" purpose="optional">
- <unit bldFile="resourcemgmt/hwresourcesmgr/group" mrp="resourcemgmt/hwresourcesmgr/group/telephony_hwrm.mrp"/>
- </component>
- <component id="hwresourcesmgrconfig" name="Hardware Resources Manager Config" introduced="^3" purpose="optional" class="config">
- <unit bldFile="resourcemgmt/hwresourcesmgrconfig" mrp="resourcemgmt/hwresourcesmgrconfig/telephony_hwrm-config.mrp"/>
+ <component id="tiltcompensationssy" filter="s60" name="Tilt Compensation SSY" class="plugin">
+ <unit bldFile="sensorservices/tiltcompensationssy/group"/>
</component>
- <component id="resourcemgmt_build" filter="s60" name="Resource Management Build">
- <!-- need to reconcile this with the above components -->
- <unit bldFile="resourcemgmt/group"/>
- </component>
- <component id="resourcemgmt_test" filter="s60" purpose="development" name="Resource Management Test">
- <!-- is this component needed?-->
- <!-- <unit bldFile="resourcemgmt/tsrc/public/basic/group"/> -->
- </component>
- <component id="powerandmemorynotificationservice" name="Power and Memory Notification Service" introduced="6.0" purpose="mandatory">
- <unit bldFile="resourcemgmt/powerandmemorynotificationservice/group" mrp="resourcemgmt/powerandmemorynotificationservice/group/syslibs_pwrcli.mrp"/>
+ <component id="sensordatacompensator" filter="s60" name="Sensor Data Compensator">
+ <unit bldFile="sensorservices/sensordatacompensator/group"/>
</component>
</collection>
<collection id="hwrmhaptics" name="HWRM Haptics" level="plugin">
@@ -180,49 +86,49 @@
<unit bldFile="hwrmhaptics/hapticsclient/group"/>
</component>
<component id="hwrmhaptics_build" filter="s60" name="HWRM Haptics Build">
- <!-- can these exports be put in the appropriate above components? -->
+ <!-- move these exports into the appropriate above components and delete this component-->
<unit bldFile="hwrmhaptics/group"/>
</component>
</collection>
<collection id="mediator" name="Mediator" level="app-if">
+ <!--collection is really a component. Move it down a directory -->
<component id="mediator_build" filter="s60" name="Mediator Build">
<unit bldFile="mediator/group"/>
</component>
- <component id="mediator_test" filter="s60" purpose="development" name="Mediator Test">
- <!-- need to have a single unit in this component. Either #include one bld.inf from the other or remove the component -->
- <!-- <unit bldFile="mediator/tsrc/public/basic/group"/> -->
- <!-- <unit bldFile="mediator/tsrc/public/basic/stub/group"/> -->
- </component>
</collection>
<collection id="psmservices" name="Power Save Mode Services" level="app-if">
<component id="psmserver" filter="s60" name="PSM Server">
<unit bldFile="psmservices/psmserver/group"/>
- <!-- is this test bld.inf needed for the build? -->
- <!-- <unit bldFile="psmservices/psmserver/tsrc/public/basic/group"/> -->
</component>
</collection>
- <collection id="sensorservices" name="Sensor Services" level="framework">
- <component id="sensorserver" filter="s60" name="Sensor Server">
- <unit bldFile="sensorservices/sensorserver/group"/>
- <!-- are these test bld.infs needed for the build? -->
- <!-- <unit bldFile="sensorservices/sensorserver/tsrc/public/basic/group"/> -->
- <!-- <unit bldFile="sensorservices/sensorserver/tsrc/public/basic/sensortestmodule/condevalstub/group"/> -->
- <!-- <unit bldFile="sensorservices/sensorserver/tsrc/public/basic/sensortestmodule/group"/> -->
- <!-- <unit bldFile="sensorservices/sensorserver/tsrc/public/basic/sensortestmodule/sensrvcondevalplugin/group"/> -->
- <!-- <unit bldFile="sensorservices/sensorserver/tsrc/public/basic/sensortestmodule/ssystub/group"/> -->
- <!-- <unit bldFile="sensorservices/sensorserver/tsrc/public/basic/sensortestmodule/stubprocess/group"/> -->
+ <collection id="resourcemgmt" name="Resource Management" level="hw-if">
+ <component id="hwrmfmtxwatcherplugin" filter="s60" name="HWRM FM Transmitter Watcher Plugin" class="plugin">
+ <unit bldFile="resourcemgmt/hwrmfmtxwatcherplugin/group"/>
+ </component>
+ <component id="hwrmtargetmodifierplugin" filter="s60" name="HWRM Target Modifier Plugin" class="plugin">
+ <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,
+ may need to -->
+ <!-- <unit bldFile="resourcemgmt/hwrmtargetmodifierplugin/group"/> -->
</component>
- <component id="orientationssy" filter="s60" name="Orientation SSY" class="plugin">
- <unit bldFile="sensorservices/orientationssy/group"/>
+ <component id="vibractrl" filter="s60" name="Vibra Control" deprecated="9.1">
+ <unit bldFile="resourcemgmt/vibractrl/group"/>
</component>
- <component id="tiltcompensationssy" filter="s60" name="Tilt Compensation SSY" class="plugin">
- <unit bldFile="sensorservices/tiltcompensationssy/group"/>
+ <component id="hwresourcesmgr" name="Hardware Resources Manager" introduced="^2" purpose="optional">
+ <unit bldFile="resourcemgmt/hwresourcesmgr/group" mrp="resourcemgmt/hwresourcesmgr/group/telephony_hwrm.mrp"/>
</component>
- <component id="sensordatacompensator" filter="s60" name="Sensor Data Compensator">
- <unit bldFile="sensorservices/sensordatacompensator/group"/>
- <!-- are these test bld.infs needed for the build? -->
- <!-- <unit bldFile="sensorservices/sensordatacompensator/tsrc/sensordatacompensatorpluginstub/group"/> -->
- <!-- <unit bldFile="sensorservices/sensordatacompensator/tsrc/sensordatacompensatortest/group"/> -->
+ <component id="hwresourcesmgrconfig" name="Hardware Resources Manager Config" introduced="^3" purpose="optional" class="config">
+ <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.
+ This needs to be kept around until configuration is in place -->
+ <unit bldFile="resourcemgmt/group"/>
+ </component>
+ <component id="powerandmemorynotificationservice" name="Power and Memory Notification Service" introduced="6.0" purpose="mandatory">
+ <unit bldFile="resourcemgmt/powerandmemorynotificationservice/group" mrp="resourcemgmt/powerandmemorynotificationservice/group/syslibs_pwrcli.mrp"/>
</component>
</collection>
<collection id="sysstatemgmt" name="System State Management" level="server">
@@ -232,6 +138,30 @@
<!-- <unit bldFile="sysstatemgmt/starter/strtsecnote/group"/> -->
<!-- <unit bldFile="sysstatemgmt/starter/strtsecobs/group"/> -->
</component>
+ <component id="ssmmapperutility" filter="s60" name="SSM Mapper Utility" introduced="^3">
+ <unit bldFile="sysstatemgmt/ssmmapperutility/group"/>
+ </component>
+ <component id="ssmpolicyplugins" filter="s60" name="SSM Policy Plugins" class="plugin" introduced="^3">
+ <unit bldFile="sysstatemgmt/ssmpolicyplugins/group"/>
+ </component>
+ <component id="ssmutilityplugins" filter="s60" name="SSM Utility Plugins" class="plugin" introduced="^3">
+ <unit bldFile="sysstatemgmt/ssmutilityplugins/group"/>
+ </component>
+ <component id="ssmcmdlists" filter="s60" name="SSM Command Lists" introduced="^3">
+ <unit bldFile="sysstatemgmt/ssmcmdlists/group"/>
+ </component>
+ <component id="ssmcustcmds" filter="s60" name="SSM Custom Commands" introduced="^3">
+ <unit bldFile="sysstatemgmt/ssmcustcmds/group"/>
+ </component>
+ <component id="syslangutil" filter="s60" name="System Language Utility" introduced="^3">
+ <unit bldFile="sysstatemgmt/syslangutil/group"/>
+ </component>
+ <component id="sysrestart" filter="s60" name="System Restart" introduced="^3">
+ <unit bldFile="sysstatemgmt/sysrestart/group"/>
+ </component>
+ <component id="sysuiprovider" filter="s60" name="System UI Provider" introduced="^3">
+ <unit bldFile="sysstatemgmt/sysuiprovider/group"/>
+ </component>
<component id="systemstarter" name="System Starter" introduced="9.1" deprecated="^3" purpose="mandatory">
<unit bldFile="sysstatemgmt/systemstarter/group" mrp="sysstatemgmt/systemstarter/group/app-framework_sysstart.mrp"/>
</component>
@@ -244,9 +174,6 @@
<component id="systemstatereferenceplugins" name="System State Reference Plugins" introduced="^3" purpose="optional" class="plugin">
<unit bldFile="sysstatemgmt/systemstatereferenceplugins/group" mrp="sysstatemgmt/systemstatereferenceplugins/group/app-framework_ssrefplugins.mrp"/>
</component>
- <component id="sysstatemgmt_test" filter="s60" purpose="development" name="System State Management Test">
- <!-- <unit bldFile="sysstatemgmt/tsrc/public/basic/group"/> -->
- </component>
</collection>
<collection id="resourceinterfaces" name="Resource Interfaces" level="hw-if">
<component id="fmtransmittercontrol" name="FM Transmitter Control" introduced="^3" purpose="optional">
@@ -267,25 +194,12 @@
</component>
</collection>
<collection id="devicesrv_info" name="Device Services Info" level="app-if">
+ <component id="devicesrv_plat" filter="s60" name="Device Services Platform Interfaces" class="api">
+ <unit bldFile="devicesrv_plat/group"/>
+ </component>
<component id="devicesrv_pub" filter="s60" name="Device Services Public Interfaces" class="api">
<unit bldFile="devicesrv_pub/group"/>
- <!-- <unit bldFile="devicesrv_pub/accessory_monitoring_api/tsrc/bc/accmonapibctests/group"/> -->
- <!-- <unit bldFile="devicesrv_pub/feature_discovery_api/tsrc/bc/featurediscovery/group"/> -->
- <!-- <unit bldFile="devicesrv_pub/find_item_api/tsrc/bc/finditem/group"/> -->
- <!-- <unit bldFile="devicesrv_pub/hwrm_power_state_api/tsrc/bc/powerstate/group"/> -->
- <!-- <unit bldFile="devicesrv_pub/light_api/tsrc/bc/light/group"/> -->
- <!-- <unit bldFile="devicesrv_pub/phone_parser_api/tsrc/bc/phoneparser/group"/> -->
- <!-- <unit bldFile="devicesrv_pub/platform_environment_api/tsrc/bc/platformenv/group"/> -->
- <!-- <unit bldFile="devicesrv_pub/sensor_channel_api/tsrc/bc/sensor/group"/> -->
- <!-- <unit bldFile="devicesrv_pub/sensor_data_compensator_api/tsrc/bc/sensordatacompensatortest/group"/> -->
- <!-- <unit bldFile="devicesrv_pub/sysutil_api/tsrc/bc/sysutil/group"/> -->
- <!-- <unit bldFile="devicesrv_pub/text_resolver_api/tsrc/bc/textresolver/group"/> -->
- <!-- <unit bldFile="devicesrv_pub/version_info_api/tsrc/bc/platformvertest/group"/> -->
- <!-- <unit bldFile="devicesrv_pub/vibra_api/tsrc/bc/vibra/group"/> -->
- </component>
- <component id="devicesrv_plat" filter="s60" name="Device Services Platform Interfaces" class="api">
- <unit bldFile="devicesrv_plat/group"/>
- <!-- <unit bldFile="devicesrv_plat/activity_manager_api/tsrc/group"/> -->
+ <unit bldFile="devicesrv_pub/platform_path_definitions_api/group" filter="bldmefirst"/> <!-- separate to another component? -->
</component>
<component id="devicesrv_metadata" name="Device Services Metadata" class="config" introduced="^2" purpose="development" target="desktop">
<unit mrp="devicesrv_info/devicesrv_metadata/devicesrv_metadata.mrp"/>
--- a/symbian3/os/graphics/package_definition_3.0.xml Wed Feb 03 19:36:09 2010 +0000
+++ b/symbian3/os/graphics/package_definition_3.0.xml Wed Feb 03 20:06:22 2010 +0000
@@ -2,6 +2,12 @@
<SystemDefinition schema="3.0.0">
<package id="graphics" name="Graphics" levels="adaptation engines internal-adaptations device-interface internal-utils app-if">
<collection id="graphicsaccelaration" name="Graphics Acceleration" level="adaptation">
+ <component id="3d_opengl_es_1_1" filter="s60" name="3D OpenGL ES 1.1" introduced="^3">
+ <unit bldFile="graphicsaccelaration/3d_opengl_es_1_1/group"/>
+ </component>
+ <component id="2d_openvg_1_1" filter="s60" name="2D OpenVG 1.1" introduced="^3">
+ <unit bldFile="graphicsaccelaration/2D_OpenVG_1_1/group"/>
+ </component>
<component id="vgi" filter="s60" name="VGI">
<unit bldFile="graphicsaccelaration/vgi/group"/>
</component>
@@ -53,13 +59,12 @@
</component>
</collection>
<collection id="graphics_info" name="Graphics Info" level="app-if">
- <component id="graphics_pub" filter="s60" name="Graphics Public Interfaces" class="api">
- <!-- is this a real public API? -->
- <!-- <unit bldFile="graphics_pub/group"/> -->
- </component>
<component id="graphics_plat" filter="s60" name="Graphics Platform Interfaces" class="api">
<unit bldFile="graphics_plat/group"/>
</component>
+ <component id="graphics_pub" filter="s60" name="Graphics Public Interfaces" class="api">
+ <unit bldFile="graphics_pub/group"/>
+ </component>
<component id="graphicsdocs" name="Graphics Documentation" purpose="development" class="doc">
<unit mrp="graphics_info/graphicsdocs/graphics_documentation.mrp"/>
</component>
@@ -98,6 +103,7 @@
<unit bldFile="openvg/openvginterface/group" mrp="openvg/openvginterface/group/graphics_openvgheaders.mrp"/>
</component>
<component id="openvg11" filter="s60" name="OpenVG 1.1">
+ <!-- this needs to be moved to it's own component directory, ie openvg/openvg11 -->
<unit bldFile="openvg/openvginterface/group/openvg11"/>
</component>
</collection>
--- a/symbian3/os/imagingext/package_definition_3.0.xml Wed Feb 03 19:36:09 2010 +0000
+++ b/symbian3/os/imagingext/package_definition_3.0.xml Wed Feb 03 20:06:22 2010 +0000
@@ -6,7 +6,7 @@
<unit bldFile="imageadaptationextensions/iclextjpegapi/group"/>
</component>
<component id="imageadaptationextensions_build" filter="s60" name="Image Adaptation Extensions Build">
- <!-- consider moving the export from this bld.inf into the above one and remove this component -->
+ <!-- Move the export from this bld.inf into the above one and remove this component, or make this a ROM component -->
<unit bldFile="imageadaptationextensions/group"/>
</component>
</collection>
@@ -22,13 +22,14 @@
<component id="imagingext_plat" filter="s60" name="Imaging Extensions Platform Interfaces" class="api">
<unit bldFile="imagingext_plat/group"/>
</component>
- <component id="imagingext_build" filter="s60" name="Imaging Extensions Build">
- <unit bldFile="group"/>
- </component>
<component id="imagingext_pub" filter="s60" name="Imaging Extensions Public Interfaces" class="api">
<unit bldFile="imagingext_pub/group"/>
- <!-- does this tes unit need to be #included in the above one? -->
- <!-- <unit bldFile="imagingext_pub/exif_api/tsrc/group"/> -->
+ </component>
+ <component id="imagingext_test" filter="s60,api_test" name="Imaging Extensions Platform API Tests" purpose="development">
+ <unit bldFile="imagingext_plat/extended_icl_jpeg_api/tsrc/group"/>
+ </component>
+ <component id="imagingext_test" filter="s60,api_test" name="Imaging Extensions Public API Tests" purpose="development">
+ <unit bldFile="imagingext_pub/exif_api/tsrc/group"/>
</component>
</collection>
</package>
--- a/symbian3/os/lbs/package_definition_3.0.xml Wed Feb 03 19:36:09 2010 +0000
+++ b/symbian3/os/lbs/package_definition_3.0.xml Wed Feb 03 20:06:22 2010 +0000
@@ -17,9 +17,16 @@
<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>
<component id="npeintegmodule" name="NPE Integration Module" introduced="^3" purpose="optional" class="plugin">
<unit bldFile="datasourcemodules/npeintegmodule/group" mrp="datasourcemodules/npeintegmodule/group/lbs_npeintegrationmodule.mrp"/>
</component>
+ <component id="datasourcemodules_build" name="Data Source Modules Build" introduced="^3" purpose="optional" filter="s60">
+ <!-- need to move the exports to another component, or make this a real component by removing the #include and moving down a directory -->
+ <unit bldFile="datasourcemodules/group"/>
+ </component>
</collection>
<collection id="datasourceadaptation" name="Data Source Adaptation" level="adaptation">
<component id="gpsdatasourceadaptation" name="GPS Data Source Adaptation" introduced="^2" purpose="optional" class="plugin">
--- a/symbian3/os/mm/package_definition_3.0.xml Wed Feb 03 19:36:09 2010 +0000
+++ b/symbian3/os/mm/package_definition_3.0.xml Wed Feb 03 20:06:22 2010 +0000
@@ -1,62 +1,63 @@
<?xml version="1.0" encoding="UTF-8"?>
<SystemDefinition schema="3.0.0">
<package id="mm" name="Multimedia" levels="adaptation hw-if device-fw devices middleware app-if">
+ <collection id="devsoundextensions" name="Devsound Extensions" level="device-fw">
+ <component id="drmaudioplayer" filter="s60" name="DRM Audio Player">
+ <unit bldFile="devsoundextensions/drmaudioplayer/group" />
+ </component>
+ <component id="mmextfw" filter="s60" name="Multimedia Extension Framework">
+ <unit bldFile="devsoundextensions/mmextfw/group" />
+ </component>
+ <component id="audiorouting" filter="s60" name="Audio Routing">
+ <unit bldFile="devsoundextensions/audiorouting/group" />
+ </component>
+ <component id="effects" filter="s60" name="Effects">
+ <unit bldFile="devsoundextensions/effects/group" />
+ </component>
+ <component id="effectspresets" filter="s60" name="Effects Presets">
+ <unit bldFile="devsoundextensions/effectspresets/group" />
+ </component>
+ <component id="effectspresets_utils" filter="s60" name="Effects Presets Utils">
+ <!-- need to #include the lot from a single bld.inf
+ Also move to a stanard component location, not under effectspresets -->
+ <unit bldFile="devsoundextensions/effectspresets/AudioEqualizerUtility/group" filter="!dfs_build"/>
+ <unit bldFile="devsoundextensions/effectspresets/EnvironmentalReverbUtility/group" filter="!dfs_build"/>
+ <unit bldFile="devsoundextensions/effectspresets/StereoWideningUtility/group" filter="!dfs_build"/>
+ </component>
+ <component id="telephonyaudiorouting" filter="s60" name="Telephony Audio Routing">
+ <unit bldFile="devsoundextensions/telephonyaudiorouting/group" />
+ </component>
+ <component id="mmfcustominterfaces" filter="s60" name="MMF Custom Interfaces">
+ <unit bldFile="devsoundextensions/mmfcustominterfaces/group" />
+ </component>
+ <component id="addeddevsoundcontrol" filter="s60" name="Added DevSound Control">
+ <unit bldFile="devsoundextensions/addeddevsoundcontrol/group" />
+ </component>
+ <component id="globalaudiosettings" filter="s60" name="Global Audio Settings">
+ <unit bldFile="devsoundextensions/globalaudiosettings/group" />
+ </component>
+ <component id="restrictedaudiooutput" filter="s60" name="Restricted Audio Output">
+ <unit bldFile="devsoundextensions/restrictedaudiooutput/group" />
+ </component>
+ <component id="ciextnfactoryplugins" filter="s60" name="Custom Interface Extension Factory Plugins" class="plugin">
+ <unit bldFile="devsoundextensions/ciextnfactoryplugins/group" />
+ </component>
+ </collection>
+ <collection id="mdfdevvideoextensions" name="MDF Dev Video Extensions" level="device-fw">
+ <component id="arm_mdf_postprocessor" filter="s60" name="ARM MDF Postprocessor">
+ <unit bldFile="mdfdevvideoextensions/arm_mdf_postprocessor/group"/>
+ </component>
+ <component id="nga_mdf_tsrc" name="NGA MDF Tests" purpose="development" filter="s60,pref_test,module_test">
+ <unit bldFile="mdfdevvideoextensions/nga_mdf_postprocessor/tsrc/StifNgaMdfPoPTest/group"/>
+ </component>
+ </collection>
<collection id="audio" name="Audio Codecs" level="middleware">
<component id="arm_cmmf_codecs" filter="s60" name="ARM CMMF Codecs" class="plugin">
<unit bldFile="audio/arm_cmmf_codecs/group"/>
</component>
</collection>
<collection id="video" name="Video Codecs" level="middleware">
- </collection>
- <collection id="devsoundextensions" name="Devsound Extensions" level="device-fw">
- <component id="drmaudioplayer" filter="s60" name="DRM Audio Player">
- <unit bldFile="devsoundextensions/drmaudioplayer/group"/>
- <!-- following two units should be #included in above bld.inf -->
- <!-- <unit bldFile="devsoundextensions/drmaudioplayer/drmplayserver/group"/> -->
- <!-- <unit bldFile="devsoundextensions/drmaudioplayer/drmplayutility/group"/> -->
- </component>
- <component id="mmextfw" filter="s60" name="Multimedia Extension Framework">
- <unit bldFile="devsoundextensions/mmextfw/group"/>
- </component>
- <component id="audiorouting" filter="s60" name="Audio Routing">
- <unit bldFile="devsoundextensions/audiorouting/group"/>
- </component>
- <component id="effects" filter="s60" name="Effects">
- <unit bldFile="devsoundextensions/effects/group"/>
- <!-- should test be #included in group file?-->
- <!-- <unit bldFile="devsoundextensions/effects/effecttest"/> -->
- </component>
- <component id="effectspresets" filter="s60" name="Effects Presets">
- <unit bldFile="devsoundextensions/effectspresets/group"/>
- </component>
- <component id="telephonyaudiorouting" filter="s60" name="Telephony Audio Routing">
- <unit bldFile="devsoundextensions/telephonyaudiorouting/group"/>
- <!-- should the following should be #included in the above bld.inf? -->
- <!-- <unit bldFile="devsoundextensions/telephonyaudiorouting/server/group"/> -->
- <!-- <unit bldFile="devsoundextensions/telephonyaudiorouting/session/group"/> -->
- <!-- <unit bldFile="devsoundextensions/telephonyaudiorouting/telephonyaudioroutingbase/group"/> -->
- <!-- <unit bldFile="devsoundextensions/telephonyaudiorouting/telephonyaudioroutingmanager/group"/> -->
- </component>
- <component id="mmfcustominterfaces" filter="s60" name="MMF Custom Interfaces">
- <unit bldFile="devsoundextensions/mmfcustominterfaces/group"/>
- </component>
- <component id="addeddevsoundcontrol" filter="s60" name="Added DevSound Control">
- <unit bldFile="devsoundextensions/addeddevsoundcontrol/group"/>
- </component>
- <component id="globalaudiosettings" filter="s60" name="Global Audio Settings">
- <unit bldFile="devsoundextensions/globalaudiosettings/group"/>
- </component>
- <component id="restrictedaudiooutput" filter="s60" name="Restricted Audio Output">
- <unit bldFile="devsoundextensions/restrictedaudiooutput/group"/>
- </component>
- <component id="ciextnfactoryplugins" filter="s60" name="Custom Interface Extension Factory Plugins" class="plugin">
- <unit bldFile="devsoundextensions/ciextnfactoryplugins/group"/>
- </component>
- </collection>
- <collection id="mdfdevvideoextensions" name="MDF Dev Video Extensions" level="device-fw">
- <component id="arm_mdf_postprocessor" filter="s60" name="ARM MDF Postprocessor">
- <unit bldFile="mdfdevvideoextensions/arm_mdf_postprocessor/group"/>
- </component>
+ <!-- empty -->
</collection>
<collection id="videoadaptationextensions" name="Video Adaptation Extensions" level="adaptation">
<component id="postingsurface" filter="s60" name="Posting Surface">
@@ -106,41 +107,18 @@
</component>
</collection>
<collection id="mm_info" name="Multimedia Info" level="app-if">
- <component id="mm_pub" filter="s60" name="Multimedia Public Interfaces" class="api">
- <unit bldFile="mm_pub/group"/>
- <!-- should #include the following from the main bld.inf -->
- <unit bldFile="mm_pub/audio_effects_api/tsrc/group"/>
- <unit bldFile="mm_pub/audio_effects_presets_api/tsrc/group"/>
- <unit bldFile="mm_pub/drm_audio_player_api/tsrc/group"/>
- </component>
<component id="mm_plat" filter="s60" name="Multimedia Platform Interfaces" class="api">
<unit bldFile="mm_plat/group"/>
- <!-- should #include the following from the main bld.inf -->
- <unit bldFile="mm_plat/aac_decoder_config_api/tsrc/group"/>
- <unit bldFile="mm_plat/audio_routing_api/tsrc/group"/>
- <unit bldFile="mm_plat/audio_visualization_api/tsrc/group"/>
- <unit bldFile="mm_plat/eaac_plus_decoder_interface_api/tsrc/group"/>
- <unit bldFile="mm_plat/error_concealment_interface_api/tsrc/group"/>
- <unit bldFile="mm_plat/g711_decoder_interface_api/tsrc/group"/>
- <unit bldFile="mm_plat/g711_encoder_interface_api/tsrc/group"/>
- <unit bldFile="mm_plat/g729_decoder_interface_api/tsrc/group"/>
- <unit bldFile="mm_plat/g729_encoder_interface_api/tsrc/group"/>
- <unit bldFile="mm_plat/global_audio_settings_api/tsrc/group"/>
- <unit bldFile="mm_plat/ilbc_decoder_interface_api/tsrc/group"/>
- <unit bldFile="mm_plat/ilbc_encoder_interface_api/tsrc/group"/>
- <unit bldFile="mm_plat/ra8_decoder_interface_api/tsrc/group"/>
- <unit bldFile="mm_plat/restricted_audio_output_api/tsrc/group"/>
- <unit bldFile="mm_plat/sbc_encoder_interface_api/tsrc/group"/>
- <unit bldFile="mm_plat/speech_encoder_config_api/tsrc/group"/>
- <unit bldFile="mm_plat/wma_decoder_interface_api/tsrc/group"/>
</component>
- <component id="mm_build" filter="s60" name="Multimedia Build">
- <!-- add system include to each bld.inf mentioned and remove this -->
- <unit bldFile="group"/>
+ <component id="mm_pub" filter="s60" name="Multimedia Public Interfaces" class="api">
+ <unit bldFile="mm_pub/group"/>
</component>
<component id="mmdocs" name="Multimedia Documentation" purpose="development" class="doc">
<unit mrp="mm_info/mmdocs/multimedia_documentation.mrp"/>
</component>
+ <component id="mm_tsrc" name="Multimedia Tests" purpose="development" filter="s60,api_test,pref_test">
+ <unit bldFile="tsrc/group"/>
+ </component>
<component id="mm_metadata" name="Multimedia Metadata" class="config" introduced="^2" purpose="development" target="desktop">
<unit mrp="mm_info/mm_metadata/mm_metadata.mrp"/>
</component>
--- a/symbian3/os/osrndtools/package_definition_3.0.xml Wed Feb 03 19:36:09 2010 +0000
+++ b/symbian3/os/osrndtools/package_definition_3.0.xml Wed Feb 03 20:06:22 2010 +0000
@@ -2,6 +2,9 @@
<SystemDefinition schema="3.0.0">
<package id="osrndtools" name="OS R&D tools" levels="fw trace">
<collection id="stif" name="STIF" level="fw">
+ <component id="stif_plat" filter="s60" name="STIF Platform Interfaces" class="api" purpose="development">
+ <unit bldFile="stif/stif_plat/group"/>
+ </component>
<component id="testinterface" filter="s60" name="Test Interface" purpose="development">
<unit bldFile="stif/testinterface/group"/>
</component>
@@ -39,25 +42,21 @@
<unit bldFile="stif/suevent/group"/>
</component>
<component id="stifkerneltestclassbase" filter="s60" name="STIF Kernel Test Class Base" purpose="development">
- <unit bldFile="stif/stifkerneltestclassbase/group"/>
- </component>
- <component id="examples" filter="s60" name="STIF Examples" purpose="development">
- <!-- <unit bldFile="stif/examples/stiftestmeasurementstub/group"/> -->
- <!-- <unit bldFile="stif/examples/stifhwresetstub/group"/> -->
- </component>
- <component id="testmoduletemplates" filter="s60" name="Test Module Templates" purpose="development">
- <!-- <unit bldFile="stif/testmoduletemplates/templatescriptxxx/group"/> -->
- <!-- <unit bldFile="stif/testmoduletemplates/templatekernelscriptxxx/group"/> -->
- <!-- <unit bldFile="stif/testmoduletemplates/capsmodifierxxx/group"/> -->
- <!-- <unit bldFile="stif/testmoduletemplates/testmodulexxx/group"/> -->
- <!-- <unit bldFile="stif/testmoduletemplates/stifunitxxx/group"/> -->
- <!-- <unit bldFile="stif/testmoduletemplates/hardcodedtestmodulexxx/group"/> -->
+ <meta rel="config">
+ <defined condition="__S60_"/>
+ </meta>
+ <!-- uncomment the unit when configuration is in place, it's currently #included from stif_build -->
+ <!-- <unit bldFile="stif/stifkerneltestclassbase/group"/>-->
</component>
<component id="stif_build" filter="s60" name="STIF Build" purpose="development">
+ <!-- move exports into self-contained component. Remove this when configuration is in place-->
<unit bldFile="stif/group"/>
</component>
</collection>
<collection id="memspy" name="Memspy" level="trace">
+ <component id="memspy_plat" filter="s60" name="Memspy Platform Interfaces" class="api" purpose="development">
+ <unit bldFile="memspy/memspy_plat/group"/>
+ </component>
<component id="driver" filter="s60" name="Memspy Driver" purpose="development">
<unit bldFile="memspy/driver/group"/>
</component>
@@ -71,19 +70,41 @@
<unit bldFile="memspy/console/group"/>
</component>
<component id="memspy_build" filter="s60" name="Memspy Build" purpose="development">
+ <!-- move exports into self-contained component.-->
<unit bldFile="memspy/group"/>
</component>
</collection>
<collection id="hti" name="Harmonized Test Interface" level="trace">
- <component id="htiframework" filter="s60" name="HTI Framework" purpose="development">
- <unit bldFile="hti/htiframework/group"/>
- </component>
+ <component id="hti_plat" filter="s60" name="HTI Platform Interfaces" class="api" purpose="development">
+ <unit bldFile="hti/hti_plat/group"/>
+ </component>
<component id="hticfg" filter="s60" name="HTI Config" purpose="development">
<unit bldFile="hti/hticfg/group"/>
</component>
<component id="htiautostart" filter="s60" name="HTI Autostart" purpose="development">
<unit bldFile="hti/htiautostart/group"/>
</component>
+ <component id="htiframework" filter="s60" name="HTI Framework" purpose="development">
+ <unit bldFile="hti/htiframework/group"/>
+ </component>
+
+ <component id="hticommplugins" filter="s60" name="HTI Communication Plugins" purpose="development" class="plugin">
+ <!-- need to #include these from a single unit or separate into component at the right directory level -->
+ <unit bldFile="hti/HtiCommPlugins/HtiBtCommPlugin/group"/>
+ <unit bldFile="hti/HtiCommPlugins/HtiIPCommPlugin/group"/>
+ <unit bldFile="hti/HtiCommPlugins/HtiSerialCommPlugin/group"/>
+ <unit bldFile="hti/HtiCommPlugins/HtiUsbSerialCommPlugin/group"/>
+ </component>
+ <component id="htiserviceplugins" filter="s60" name="HTI Service Plugins" purpose="development" class="plugin">
+ <!-- need to #include these from a single unit or separate into component at the right directory level -->
+ <unit bldFile="hti/HtiServicePlugins/HtiAppServicePlugin/group"/>
+ <unit bldFile="hti/HtiServicePlugins/HtiEchoServicePlugin/group"/>
+ <unit bldFile="hti/HtiServicePlugins/HtiFtpServicePlugin/group"/>
+ <unit bldFile="hti/HtiServicePlugins/HtiIpProxyServicePlugin/group"/>
+ <unit bldFile="hti/HtiServicePlugins/HtiStifTfServicePlugin/group"/>
+ </component>
+
+
<component id="htifilehlp" filter="s60" name="HTI File Help" purpose="development">
<unit bldFile="hti/htifilehlp/group"/>
</component>
@@ -91,6 +112,7 @@
<unit bldFile="hti/htiwatchdog/group"/>
</component>
<component id="hti_build" filter="s60" name="HTI Build" purpose="development">
+ <!-- move exports into self-contained component.-->
<unit bldFile="hti/group"/>
</component>
</collection>
@@ -104,9 +126,7 @@
</collection>
<collection id="osrndtools_info" name="OS R&D tools Info" level="trace">
<component id="osrndtools_plat" filter="s60" name="OS R&D tools Platform Interfaces" class="api" purpose="development">
- <unit bldFile="osrndtools_plat/group"/>
- <!-- need to #include the next bld.inf in the above one -->
- <unit bldFile="osrndtools_plat/hti_api/group"/>
+ <unit bldFile="osrndtools_plat/group"/> <!-- currently empty. Remove? -->
</component>
<component id="osrndtools_metadata" name="OS R&D tools Metadata" class="config" introduced="^2" purpose="development" target="desktop">
<unit mrp="osrndtools_info/osrndtools_metadata/osrndtools_metadata.mrp"/>
--- a/symbian3/os/ossrv/package_definition_3.0.xml Wed Feb 03 19:36:09 2010 +0000
+++ b/symbian3/os/ossrv/package_definition_3.0.xml Wed Feb 03 20:06:22 2010 +0000
@@ -1,39 +1,20 @@
<?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">
- <collection id="utilitylibraries" name="Utility Libraries" level="encoding">
- <component id="libutils" filter="s60" name="Utility Library">
- <!-- this can only have one unit. Should include secondary from the main bld.inf -->
- <unit bldFile="utilitylibraries/libutils/group"/>
- <unit bldFile="utilitylibraries/libutils/tsrc/group"/>
- <!-- <unit bldFile="utilitylibraries/libutils/tsrc/nft/group"/> -->
+ <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="ofdbus" name="Open Foundation D-Bus" level="utilities">
- <component id="dbus" filter="s60" name="D-Bus">
- <unit bldFile="ofdbus/dbus/group"/>
- <!-- this can only have one unit. Should include test from the main bld.inf -->
- <unit bldFile="ofdbus/dbus/tsrc/group"/>
- </component>
- <component id="dbus-glib" filter="s60" name="D-Bus GLib">
- <unit bldFile="ofdbus/dbus-glib/group"/>
- <!-- this can only have one unit. Should include test from the main bld.inf -->
- <unit bldFile="ofdbus/dbus-glib/tsrc/group"/>
+ <collection id="ssl" name="SSL" level="data-services">
+ <component id="libcrypto" filter="s60" name="Crypto Library">
+ <unit bldFile="ssl/libcrypto/group"/>
</component>
- <component id="ofdbus_rom" filter="s60" name="D-Bus ROM">
- <!-- Contains IBY for for dbus. should remove #includes to above components. Consider moving IBY file to one of the above as well and removing this component entirely -->
- <unit bldFile="ofdbus/group"/>
- </component>
- <component id="ofdbus_test" filter="s60" purpose="development" name="OF Dbus Test">
- <!-- can these be put into ofdbus component? -->
- <!-- <unit bldFile="ofdbus/tsrc/nft/idle_daemon_run/group"/> -->
- <!-- <unit bldFile="ofdbus/tsrc/nft/g_n_messages/group"/> -->
- <!-- <unit bldFile="ofdbus/tsrc/nft/g_file_send/group"/> -->
- <!-- <unit bldFile="ofdbus/tsrc/nft/send_messages1/group"/> -->
- <!-- <unit bldFile="ofdbus/tsrc/nft/stif_glib_1_simple_message/group"/> -->
- <!-- <unit bldFile="ofdbus/tsrc/nft/file_transfer_time/group"/> -->
- <!-- <unit bldFile="ofdbus/tsrc/nft/g_n_messages1/group"/> -->
- <!-- <unit bldFile="ofdbus/tsrc/nft/send_messages/group"/> -->
+ <component id="libssl" filter="s60" purpose="development" name="SSL Library">
+ <unit bldFile="ssl/libssl/group"/>
</component>
</collection>
<collection id="glib" name="GLib" level="utilities">
@@ -52,45 +33,29 @@
<component id="libgobject" filter="s60" name="Libg Object">
<unit bldFile="glib/libgobject/group"/>
</component>
- <component id="glib_test" filter="s60" purpose="development" name="GLib Test">
- <unit bldFile="glib/tsrc/group"/>
- <!-- should #include the next unit in the above bld.inf if it's needed -->
- <!-- <unit bldFile="glib/tsrc/bc/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="ssl_test" filter="s60" purpose="development" name="SSL Test">
- <unit bldFile="ssl/tsrc/group"/>
- <!-- should #include the next unit in the above bld.inf if it's needed -->
- <!-- <unit bldFile="ssl/tsrc/bc/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>
- <component id="stdcpp_test" filter="s60" purpose="development" name="Stdcpp Test">
- <unit bldFile="stdcpp/tsrc/group"/>
- <!-- these should be #included in the above bld.inf if they're needed -->
- <!-- <unit bldFile="stdcpp/tsrc/stdcpp_test/tstdcpp/twsd_manual/group"/> -->
- <!-- <unit bldFile="stdcpp/tsrc/stdcpp_test/tstdcpp/ood_manual/group"/> -->
- <!-- <unit bldFile="stdcpp/tsrc/stdcpp_test/stlport/manual/group"/> -->
- <!-- <unit bldFile="stdcpp/tsrc/boost_test/multi_array/manual/group"/> -->
- <!-- <unit bldFile="stdcpp/tsrc/stdcpp_test/tstdcpp/io_manual/group"/> -->
- <!-- <unit bldFile="stdcpp/tsrc/bc/group"/> -->
- <!-- <unit bldFile="stdcpp/tsrc/boost_test/graph/manual/group"/> -->
- <!-- <unit bldFile="stdcpp/tsrc/stdcpp_test/tstdcpp/multithread/manual/group"/> -->
+ </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="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"/>
+ <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">
@@ -152,10 +117,6 @@
</component>
</collection>
<collection id="ossrv_info" name="Generic OS Services Info" level="utilities">
- <component id="ossrv_test" filter="s60" purpose="development" name="Generic OS Services Test">
- <!-- is this needed? Can it be split up into tests for the individual packages? -->
- <!-- <unit bldFile="tsrc/group"/> -->
- </component>
<component id="ossrv_build" filter="s60" name="Generic OS Services Build">
<!-- exports should be moved to individual components -->
<unit bldFile="group"/>
@@ -165,10 +126,6 @@
</component>
<component id="ossrv_pub" filter="s60" name="Generic OS Services Public Interfaces" class="api">
<unit bldFile="ossrv_pub/group"/>
- <!-- <unit bldFile="ossrv_pub/boost_apis/tsrc/group"/> -->
- <!-- <unit bldFile="ossrv_pub/glib_arrays/tsrc/group"/> -->
- <!-- <unit bldFile="ossrv_pub/ssl_general_api/tsrc/group"/> -->
- <!-- <unit bldFile="ossrv_pub/stl/tsrc/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"/>
--- a/symbian3/os/security/package_definition_3.0.xml Wed Feb 03 19:36:09 2010 +0000
+++ b/symbian3/os/security/package_definition_3.0.xml Wed Feb 03 20:06:22 2010 +0000
@@ -70,6 +70,9 @@
<component id="filebasedcertificateandkeystores" name="File-based Certificate and Key Stores" introduced="8.0" purpose="optional">
<unit bldFile="cryptoservices/filebasedcertificateandkeystores/group" mrp="cryptoservices/filebasedcertificateandkeystores/group/security_filetokens.mrp"/>
</component>
+ <component id="Browser Root Certificates" introduced="^2" purpose="optional" filter="s60"> <!-- not really s60 -->
+ <unit mrp="cryptoservices/browserrootcertificates/browserrootcerts.mrp"/>
+ </component>
<component id="asnpkcs" name="ASN PKCS" introduced="8.0" purpose="optional">
<unit bldFile="cryptoservices/asnpkcs/group" mrp="cryptoservices/asnpkcs/group/security_asnpkcs.mrp"/>
</component>
--- a/symbian3/os/textandloc/package_definition_3.0.xml Wed Feb 03 19:36:09 2010 +0000
+++ b/symbian3/os/textandloc/package_definition_3.0.xml Wed Feb 03 20:06:22 2010 +0000
@@ -41,31 +41,17 @@
</component>
</collection>
<collection id="textandlocutils" name="Text and Localisation Utils" level="util">
- <component id="localizer" filter="s60" name="Directory Localizer">
- <!-- pending move to classicui/uiutils -->
- <unit bldFile="charconvfw/localizer/group"/>
- </component>
- <component id="findutil" filter="s60" name="Find Utility">
- <!-- pending move to classicui/uiutils -->
- <unit bldFile="charconvfw/findutil/group"/>
- </component>
+ <!-- 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="gamerecognizer" filter="s60" name="Game Recognizer" class="plugin">
- <!-- pending move to appsupport -->
- <unit bldFile="charconvfw/gamerecognizer/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="aknjapanesereading" filter="s60" name="Avkon Japanese Reading">
- <!-- pending move to classicui/uiutils -->
- <unit bldFile="charconvfw/aknjapanesereading/group"/>
- </component>
<component id="inlinetext" filter="s60" name="Inline Text">
<unit bldFile="charconvfw/inlinetext/group"/>
</component>
@@ -95,12 +81,9 @@
<collection id="textandloc_info" name="Text and Localisation Info" level="text">
<component id="textandloc_pub" filter="s60" name="Text and Localisation Public Interfaces" class="api">
<unit bldFile="textandloc_pub/group"/>
- <!-- <unit bldFile="textandloc_pub/character_conversion_plugin_provider_api/tsrc/group"/> -->
</component>
<component id="textandloc_plat" filter="s60" name="Text and Localisation Platform Interfaces" class="api">
<unit bldFile="textandloc_plat/group"/>
- <!-- <unit bldFile="textandloc_plat/findutil_api/tsrc/group"/> -->
- <!-- <unit bldFile="textandloc_plat/sortutil_api/tsrc/group"/> -->
</component>
<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"/>
--- a/symbian3/os/usb/package_definition_3.0.xml Wed Feb 03 19:36:09 2010 +0000
+++ b/symbian3/os/usb/package_definition_3.0.xml Wed Feb 03 20:06:22 2010 +0000
@@ -4,6 +4,11 @@
<collection id="usbldd" name="USB Logical Device Drivers" level="hw-if">
<!-- usbclientdrivers to be moved here from kernelhwsrv-->
</collection>
+ <collection id="usbextension" name="USB Extension" level="framework">
+ <component id="usbaudioclassdriver" name="USB Audi Class Driver" purpose="optional" filter="s60">
+ <unit bldFile="usbextension/usbaudioclassdriver/group"/>
+ </component>
+ </collection>
<collection id="usbmgmt" name="USB Management" level="server">
<component id="usbmgr" name="USB Manager" purpose="optional">
<unit version="2" bldFile="usbmgmt/usbmgr/group" mrp="usbmgmt/usbmgr/group/usb_manager.mrp"/>
@@ -16,6 +21,9 @@
</component>
</collection>
<collection id="usb_info" name="USB Info" level="app-if">
+ <component id="usb_plat" filter="s60" name="USB Platform Interfaces" class="api">
+ <unit bldFile="usb_plat/group"/>
+ </component>
<component id="usb_metadata" name="USB Metadata" class="config" introduced="^3" purpose="development" target="desktop">
<unit mrp="usb_info/usb_metadata/usb_metadata.mrp"/>
</component>
--- a/symbian3/os/wlan/package_definition_3.0.xml Wed Feb 03 19:36:09 2010 +0000
+++ b/symbian3/os/wlan/package_definition_3.0.xml Wed Feb 03 20:06:22 2010 +0000
@@ -11,6 +11,7 @@
<component id="wlandbif_cd" filter="s60" name="WLAN CommsDat interface">
<unit bldFile="wlan_bearer/wlandbif_cd/group"/>
</component>
+ <!-- should follow component directory rules for stuff in wlan_symbian/ and put in a single component or split up properly -->
<component id="wlanengine" filter="s60" name="WLAN Engine">
<unit bldFile="wlan_bearer/wlanengine/wlan_symbian/wlanengine_symbian_3.1/group"/>
</component>
--- a/symbian3/os/xmlsrv/package_definition_3.0.xml Wed Feb 03 19:36:09 2010 +0000
+++ b/symbian3/os/xmlsrv/package_definition_3.0.xml Wed Feb 03 20:06:22 2010 +0000
@@ -1,33 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<SystemDefinition schema="3.0.0">
<package id="xmlsrv" name="XML Services" levels="plugin server framework generic specific">
- <collection id="xmlengine" name="XML Engine" level="server">
- <component id="libxml2" filter="s60" name="Libxml2" deprecated="^3">
- <!-- deprecated due to duplication -->
- <unit bldFile="xmlengine/libxml2/group"/>
- </component>
- <component id="xmlengineutils" filter="s60" name="XML Engine Utils" deprecated="^3">
- <!-- deprecated due to duplication -->
- <unit bldFile="xmlengine/xmlengineutils/group"/>
- </component>
- <component id="domxpathwrapper" filter="s60" name="DOM XPath Wrapper" deprecated="^3">
- <!-- deprecated due to duplication -->
- <unit bldFile="xmlengine/domxpathwrapper/group"/>
- </component>
- <component id="xmlengineserializer" filter="s60" name="XML Engines Serializer" deprecated="^3">
- <!-- deprecated due to duplication -->
- <unit bldFile="xmlengine/xmlengineserializer/group"/>
- </component>
- <component id="xmlenginesaxplugin" filter="s60" name="XML Engine SAX Plugin" class="plugin" deprecated="^3">
- <!-- deprecated due to duplication -->
- <unit bldFile="xmlengine/xmlenginesaxplugin/group"/>
- </component>
- <component id="xmlengine_build" filter="s60" name="XML Engine Build" deprecated="^3">
- <!-- deprecated due to duplication -->
- <!-- can the hrh #include be moved to the appropriate other bld.infs? -->
- <unit bldFile="xmlengine/group"/>
- </component>
- </collection>
<collection id="xmlsecurityengine" name="XML Security Engine" level="framework">
<component id="xmlseccertman" filter="s60" name="XML Security Certificate Manager">
<unit bldFile="xmlsecurityengine/xmlseccertman/group"/>
@@ -41,10 +14,6 @@
<component id="xmlsecwrapper" filter="s60" name="XML Security Wrapper">
<unit bldFile="xmlsecurityengine/xmlsecwrapper/group"/>
</component>
- <component id="xmlsecurityengine_build" filter="s60" name="XML Security Engine Build">
- <!-- can the hrh #include be moved to the appropriate other bld.infs? -->
- <unit bldFile="xmlsecurityengine/group"/>
- </component>
</collection>
<collection id="xml" name="XML" level="generic">
<component id="xmlfw" name="XML Framework" introduced="7.0s" purpose="optional">
@@ -53,7 +22,7 @@
<component id="libxml2libs" name="Libxml2 Libraries" introduced="^3" purpose="optional">
<unit bldFile="xml/libxml2libs/group" mrp="xml/libxml2libs/group/syslibs_libxml2.mrp"/>
</component>
- <component id="legacyminidomparser" name="legacyminidomparser" introduced="7.0s" purpose="optional">
+ <component id="legacyminidomparser" name="Legacy Mini-DOM Parser" introduced="7.0s" purpose="optional">
<unit bldFile="xml/legacyminidomparser/GROUP" mrp="xml/legacyminidomparser/GROUP/syslibs_legacyminidomparser.mrp" />
</component>
<component id="xmldomandxpath" name="XML DOM and XPath" introduced="^3" purpose="optional">
@@ -72,20 +41,6 @@
<collection id="xmlsrv_info" name="XML Services Info" level="specific">
<component id="xmlsrv_plat" filter="s60" name="XML Services Platform Interfaces" class="api">
<unit bldFile="xmlsrv_plat/group"/>
- <!-- <unit bldFile="xmlsrv_plat/xml_encryption_api/tsrc/group"/> -->
- <!-- <unit bldFile="xmlsrv_plat/xml_engine_serializer_api/tsrc/group"/> -->
- <!-- <unit bldFile="xmlsrv_plat/xml_engine_utils_api/tsrc/group"/> -->
- <!-- <unit bldFile="xmlsrv_plat/xml_engine_xpath_api/tsrc/group"/> -->
- <!-- <unit bldFile="xmlsrv_plat/xml_security_engine_utils_api/tsrc/group"/> -->
- <!-- <unit bldFile="xmlsrv_plat/xml_signature_api/tsrc/group"/> -->
- </component>
- <component id="xmlsrv_build" filter="s60" name="XML Services Build">
- <!-- move ifdef into appropriate bld.inf -->
- <unit bldFile="group"/>
- </component>
- <component id="xmlsrv_pub" filter="s60" name="XML Services Public Interfaces" class="api">
- <unit bldFile="xmlsrv_pub/group"/>
- <!-- <unit bldFile="xmlsrv_pub/xml_engine_dom_api/tsrc/group"/> -->
</component>
<component id="xmlsrv_metadata" name="XML Services Metadata" class="config" introduced="^2" purpose="development" target="desktop">
<unit mrp="xmlsrv_info/xmlsrv_metadata/xmlsrv_metadata.mrp"/>