--- a/symbian3/app/location/package_definition_3.0.xml Fri Feb 12 16:37:22 2010 +0000
+++ b/symbian3/app/location/package_definition_3.0.xml Mon Feb 15 18:25:55 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 Fri Feb 12 16:37:22 2010 +0000
+++ b/symbian3/app/messaging/package_definition_3.0.xml Mon Feb 15 18:25:55 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 Fri Feb 12 16:37:22 2010 +0000
+++ b/symbian3/app/mmsharinguis/package_definition_3.0.xml Mon Feb 15 18:25:55 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.xml Fri Feb 12 16:37:22 2010 +0000
+++ b/symbian3/app/musicplayer/package_definition.xml Mon Feb 15 18:25:55 2010 +0000
@@ -137,7 +137,7 @@
</collection>
<collection name="musicplayer_info" long-name="Music Player Apps Info" level="app">
<component name="musicplayer_build" filter="s60" long-name="Music Player Build">
- <!-- should explicityly #inlcude musicplayerbldvariant.hrh in each component -->
+ <!-- should explicitly #inlcude musicplayerbldvariant.hrh in each component -->
<unit bldFile="/sf/app/musicplayer/group"/>
</component>
<component name="musicplayer_plat" filter="s60" long-name="Music Player Apps Platform Interfaces" class="api">
--- a/symbian3/app/musicplayer/package_definition_3.0.xml Fri Feb 12 16:37:22 2010 +0000
+++ b/symbian3/app/musicplayer/package_definition_3.0.xml Mon Feb 15 18:25:55 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 Fri Feb 12 16:37:22 2010 +0000
+++ b/symbian3/app/organizer/package_definition_3.0.xml Mon Feb 15 18:25:55 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 Fri Feb 12 16:37:22 2010 +0000
+++ b/symbian3/app/phone/package_definition_3.0.xml Mon Feb 15 18:25:55 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 Fri Feb 12 16:37:22 2010 +0000
+++ b/symbian3/app/printing/package_definition_3.0.xml Mon Feb 15 18:25:55 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 Fri Feb 12 16:37:22 2010 +0000
+++ b/symbian3/app/profile/package_definition_3.0.xml Mon Feb 15 18:25:55 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 Fri Feb 12 16:37:22 2010 +0000
+++ b/symbian3/app/radio/package_definition_3.0.xml Mon Feb 15 18:25:55 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.xml Fri Feb 12 16:37:22 2010 +0000
+++ b/symbian3/app/rndtools/package_definition.xml Mon Feb 15 18:25:55 2010 +0000
@@ -86,12 +86,15 @@
<collection name="filebrowser" long-name="File Browser" level="util">
<!-- consider collapsing into a single component -->
<component name="fileopserver" filter="s60" long-name="File Operations Server" purpose="development" class="tool">
- <unit bldFile="/sf/app/rndtools/filebrowser/fileopserver/group"/>
+ <!-- uncomment the unit when configuration is in place, it's currently #included from filebrowser_build -->
+ <!-- <unit bldFile="filebrowser/fileopserver/group"/>-->
</component>
<component name="fileopclient" filter="s60" long-name="File Operations Client" purpose="development" class="tool">
- <unit bldFile="/sf/app/rndtools/filebrowser/fileopclient/group"/>
+ <!-- uncomment the unit when configuration is in place, it's currently #included from filebrowser_build -->
+ <!--<unit bldFile="filebrowser/fileopclient/group"/>-->
</component>
<component name="filebrowser_build" filter="s60" long-name="File Browser Application" purpose="development" class="tool">
+ <!-- Need to make this a self-contained component by removing #includes. Can only do when configuration is in place-->
<unit bldFile="/sf/app/rndtools/filebrowser/group"/>
</component>
</collection>
--- a/symbian3/app/rndtools/package_definition_3.0.xml Fri Feb 12 16:37:22 2010 +0000
+++ b/symbian3/app/rndtools/package_definition_3.0.xml Mon Feb 15 18:25:55 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/app/webuis/package_definition.xml Fri Feb 12 16:37:22 2010 +0000
+++ b/symbian3/app/webuis/package_definition.xml Mon Feb 15 18:25:55 2010 +0000
@@ -90,18 +90,20 @@
</collection>
<collection name="browserplugins" long-name="Browser Plugins" level="plugin">
<component name="browsersysteminfoplugin" filter="s60" long-name="Browser System Info Plugin" plugin="Y">
- <unit bldFile="/sf/app/webuis/browserplugins/browsersysteminfoplugin/group"/>
+ <!-- uncomment the unit when configuration is in place, it's currently #included from browserplugins_build -->
+ <!-- <unit bldFile="browserplugins/browsersysteminfoplugin/group"/>-->
</component>
<component name="browsergpsplugin" filter="s60" long-name="Browser GPS Plugin" plugin="Y">
- <unit bldFile="/sf/app/webuis/browserplugins/browsergpsplugin/group"/>
+ <!-- uncomment the unit when configuration is in place, it's currently #included from browserplugins_build -->
+ <!-- <unit bldFile="browserplugins/browsergpsplugin/group"/>-->
</component>
<component name="browseraudiovideoplugin" filter="s60" long-name="Browser Audio Video Plugin" plugin="Y">
<unit bldFile="/sf/app/webuis/browserplugins/browseraudiovideoplugin/group"/>
</component>
- <!-- <component id="browserplugins_build" filter="s60" name="Browser Plugins Build">-->
- <!-- can the #ifdef in this be handled elsewhere? -->
- <!-- <unit bldFile="browserplugins/group"/>
- </component>-->
+ <component name="browserplugins_build" filter="s60" long-name="Browser Plugins Build">
+ <!-- when configuration is in place, the #ifdef is no longer needed and this component can be removed -->
+ <unit bldFile="/sf/app/webuis/browserplugins/group"/>
+ </component>
</collection>
<collection name="pushmtm" long-name="Push MTM" level="plugin">
<component name="pushmtm_help" filter="s60" long-name="Push MTM Help">
--- a/symbian3/app/webuis/package_definition_3.0.xml Fri Feb 12 16:37:22 2010 +0000
+++ b/symbian3/app/webuis/package_definition_3.0.xml Mon Feb 15 18:25:55 2010 +0000
@@ -17,21 +17,23 @@
<meta rel="config">
<defined condition="__WEB_WIDGETS"/>
</meta>
- <unit bldFile="browserplugins/browsersysteminfoplugin/group"/>
+ <!-- uncomment the unit when configuration is in place, it's currently #included from browserplugins_build -->
+ <!-- <unit bldFile="browserplugins/browsersysteminfoplugin/group"/>-->
</component>
<component id="browsergpsplugin" filter="s60" name="Browser GPS Plugin" class="plugin">
<meta rel="config">
<defined condition="__WEB_WIDGETS"/>
</meta>
- <unit bldFile="browserplugins/browsergpsplugin/group"/>
+ <!-- uncomment the unit when configuration is in place, it's currently #included from browserplugins_build -->
+ <!-- <unit bldFile="browserplugins/browsergpsplugin/group"/>-->
</component>
<component id="browseraudiovideoplugin" filter="s60" name="Browser Audio Video Plugin" class="plugin">
<unit bldFile="browserplugins/browseraudiovideoplugin/group"/>
</component>
- <!-- <component id="browserplugins_build" filter="s60" name="Browser Plugins Build">-->
- <!-- can the #ifdef in this be handled elsewhere? -->
- <!-- <unit bldFile="browserplugins/group"/>
- </component>-->
+ <component id="browserplugins_build" filter="s60" name="Browser Plugins Build">
+ <!-- when configuration is in place, the #ifdef is no longer needed and this component can be removed -->
+ <unit bldFile="browserplugins/group"/>
+ </component>
</collection>
<collection id="pushmtm" name="Push MTM" level="plugin">
<component id="pushmtm_help" filter="s60" name="Push MTM Help">
--- a/symbian3/mw/accesssec/package_definition_3.0.xml Fri Feb 12 16:37:22 2010 +0000
+++ b/symbian3/mw/accesssec/package_definition_3.0.xml Mon Feb 15 18:25:55 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 Fri Feb 12 16:37:22 2010 +0000
+++ b/symbian3/mw/appinstall/package_definition_3.0.xml Mon Feb 15 18:25:55 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 Fri Feb 12 16:37:22 2010 +0000
+++ b/symbian3/mw/appsupport/package_definition_3.0.xml Mon Feb 15 18:25:55 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 Fri Feb 12 16:37:22 2010 +0000
+++ b/symbian3/mw/btservices/package_definition_3.0.xml Mon Feb 15 18:25:55 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.xml Fri Feb 12 16:37:22 2010 +0000
+++ b/symbian3/mw/camerasrv/package_definition.xml Mon Feb 15 18:25:55 2010 +0000
@@ -1,109 +1,127 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE SystemDefinition [
- <!ELEMENT SystemDefinition (systemModel?,SystemBuild?)>
- <!ATTLIST SystemDefinition
- name CDATA #REQUIRED
- schema CDATA #REQUIRED>
- <!ELEMENT systemModel (layer+)>
- <!ELEMENT layer (block*|collection*)*>
- <!ATTLIST layer
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED
- levels NMTOKENS #IMPLIED
- span CDATA #IMPLIED>
- <!ELEMENT block (subblock*|collection*)*>
- <!ATTLIST block
- levels NMTOKENS #IMPLIED
- span CDATA #IMPLIED
- level NMTOKEN #IMPLIED
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED>
- <!ELEMENT subblock (collection)*>
- <!ATTLIST subblock
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED>
- <!ELEMENT collection (component)*>
- <!ATTLIST collection
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED
- level NMTOKEN #IMPLIED>
- <!ELEMENT component (unit)*>
- <!ATTLIST component
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED
- deprecated CDATA #IMPLIED
- introduced CDATA #IMPLIED
- contract CDATA #IMPLIED
- plugin (Y|N) 'N'
- filter CDATA #IMPLIED
- class NMTOKENS #IMPLIED
- supports CDATA #IMPLIED
- purpose (optional|mandatory|development) 'optional'>
- <!ELEMENT unit EMPTY>
- <!ATTLIST unit
- mrp CDATA #IMPLIED
- filter CDATA #IMPLIED
- bldFile CDATA #IMPLIED
- root CDATA #IMPLIED
- version NMTOKEN #IMPLIED
- prebuilt NMTOKEN #IMPLIED
- late (Y|N) #IMPLIED
- priority CDATA #IMPLIED>
- <!ELEMENT SystemBuild (option*|target+|targetList+|list+|configuration+)*>
- <!ATTLIST SystemBuild schema CDATA #REQUIRED>
- <!ELEMENT list (ref+)>
- <!ATTLIST list
- name ID #REQUIRED
- description CDATA #REQUIRED>
- <!ELEMENT ref EMPTY>
- <!ATTLIST ref item CDATA #REQUIRED>
- <!ELEMENT targetList EMPTY>
- <!ATTLIST targetList
- name ID #REQUIRED
- description CDATA #REQUIRED
- target IDREFS #REQUIRED>
- <!ELEMENT target EMPTY>
- <!ATTLIST target
- name ID #REQUIRED
- abldTarget CDATA #REQUIRED
- description CDATA #REQUIRED>
- <!ELEMENT option EMPTY>
- <!ATTLIST option
- name ID #REQUIRED
- abldOption CDATA #REQUIRED
- description CDATA #REQUIRED
- enable (Y|N) #REQUIRED>
- <!ELEMENT configuration (listRef+|ref+|task+)*>
- <!ATTLIST configuration
- name ID #REQUIRED
- description CDATA #REQUIRED
- filter CDATA #REQUIRED>
- <!ELEMENT task (listRef*,(buildLayer|specialInstructions))>
- <!ELEMENT listRef EMPTY>
- <!ATTLIST listRef list CDATA #REQUIRED>
- <!ELEMENT buildLayer EMPTY>
- <!ATTLIST buildLayer
- command CDATA #REQUIRED
- targetList IDREFS #IMPLIED
- unitParallel (Y|N) #REQUIRED
- targetParallel (Y|N) 'N'>
- <!ELEMENT specialInstructions EMPTY>
- <!ATTLIST specialInstructions
- name CDATA #REQUIRED
- cwd CDATA #REQUIRED
- root CDATA #IMPLIED
- command CDATA #REQUIRED>
-]>
-<SystemDefinition schema="2.0.1" name="Symbian^3">
-<systemModel>
-<layer name="mw">
-<block name="camerasrv">
-<collection name="s60">
-<component name="camerasrv">
-<unit bldFile="/sf/mw/camerasrv/group" mrp=""/>
-</component>
-</collection>
-</block>
-</layer>
-</systemModel>
+<!DOCTYPE SystemDefinition [
+<!ELEMENT SystemDefinition ( systemModel )>
+<!ATTLIST SystemDefinition
+ name CDATA #REQUIRED
+ schema CDATA #REQUIRED
+>
+<!-- all paths are relative to the environment variable specified by the root attribute, or SOURCEROOT if not. -->
+
+<!-- System Model Section of DTD -->
+<!ELEMENT systemModel (layer+)>
+
+<!ELEMENT layer (block* | collection*)*>
+<!-- Kernel Services, Base Services, OS Services, Etc -->
+<!ATTLIST layer
+ name CDATA #REQUIRED
+ long-name CDATA #IMPLIED
+ levels NMTOKENS #IMPLIED
+ span CDATA #IMPLIED
+>
+
+<!ELEMENT block (subblock* | collection*)*>
+ <!-- Generic OS services, Comms Services, etc -->
+<!ATTLIST block
+ levels NMTOKENS #IMPLIED
+ span CDATA #IMPLIED
+ level NMTOKEN #IMPLIED
+ name CDATA #REQUIRED
+ long-name CDATA #IMPLIED
+>
+
+<!ELEMENT subblock (collection)*>
+<!-- Cellular Baseband Services, Networking Services, etc -->
+<!ATTLIST subblock
+ name CDATA #REQUIRED
+ long-name CDATA #IMPLIED
+>
+
+<!ELEMENT collection (component)*>
+<!-- Screen Driver, Content Handling, etc -->
+<!ATTLIST collection
+ name CDATA #REQUIRED
+ long-name CDATA #IMPLIED
+ level NMTOKEN #IMPLIED
+>
+
+<!ELEMENT component (unit)*>
+<!-- contains units or is a package or prebuilt -->
+<!ATTLIST component
+ name CDATA #REQUIRED
+ long-name CDATA #IMPLIED
+ deprecated CDATA #IMPLIED
+ introduced CDATA #IMPLIED
+ contract CDATA #IMPLIED
+ plugin (Y|N) "N"
+ filter CDATA #IMPLIED
+ class NMTOKENS #IMPLIED
+ supports CDATA #IMPLIED
+ purpose ( optional | mandatory | development ) "optional"
+>
+
+<!ELEMENT unit EMPTY >
+<!-- must be buildable (bld.inf) -->
+<!-- bldFile may someday be removed in favour of mrp -->
+<!ATTLIST unit
+ mrp CDATA #IMPLIED
+ filter CDATA #IMPLIED
+ bldFile CDATA #IMPLIED
+ root CDATA #IMPLIED
+ version NMTOKEN #IMPLIED
+ prebuilt NMTOKEN #IMPLIED
+ late (Y|N) #IMPLIED
+ priority CDATA #IMPLIED
+>
+]>
+<SystemDefinition name="Symbian^3" schema="2.0.1">
+ <systemModel>
+ <layer name="mw" long-name="Middleware" levels="generic specific">
+ <block name="camerasrv" level="specific" long-name="Camera Services" levels="plugin fw api">
+ <collection name="camappengine" long-name="Camera App Engine" level="fw">
+ <!-- is this collection really a component? If so, move down a directory -->
+ <component name="stillconverter" filter="s60" long-name="Still Image Converter" class="placeholder">
+ <!-- should separate this from parent engine's bld.inf -->
+ <!-- <unit bldFile="camappengine/stillconverter/group"/> -->
+ </component>
+ <component name="camappengine_engine" filter="s60" long-name="Camera App Engine" class="placeholder">
+ <!-- should separate this from parent engine's bld.inf -->
+ <!-- <unit bldFile="camappengine/engine/group"/> -->
+ </component>
+ <component name="asynchfilesavequeue" filter="s60" long-name="Asynch File Save Queue">
+ <unit bldFile="/sf/mw/camerasrv/camappengine/asynchfilesavequeue/group"/>
+ </component>
+ <component name="camappengine_build" filter="s60" long-name="Camera App Engine Build">
+ <unit bldFile="/sf/mw/camerasrv/camappengine/build"/>
+ </component>
+ </collection>
+ <collection name="camcordermmfplugin" long-name="Camcorder MMF Plugin" level="plugin">
+ <!-- collection is really a component. Should move down a directory -->
+ <component name="camcordermmfplugin_build" filter="s60" long-name="Camcorder MMF Plugin Build" plugin="Y">
+ <unit bldFile="/sf/mw/camerasrv/camcordermmfplugin/build"/>
+ </component>
+ </collection>
+ <collection name="configmanagers" long-name="Config Managers" level="api">
+ <component name="imagingconfigmanager" filter="s60" long-name="Imaging Config Manager">
+ <unit bldFile="/sf/mw/camerasrv/configmanagers/imagingconfigmanager/group"/>
+ </component>
+ </collection>
+ <collection name="camerasrv_info" long-name="Camera Services Info" level="api">
+ <component name="camerasrv_plat" filter="s60" long-name="Camera Services Platform Interfaces" class="api">
+ <unit bldFile="/sf/mw/camerasrv/camerasrv_plat/group"/>
+ </component>
+ <component name="camerasrv_test" filter="s60,api_test" long-name="Camera Services API Test" purpose="development">
+ <!-- #include from a single bld.inf or split into mutliple componens -->
+ <unit bldFile="/sf/mw/camerasrv/camerasrv_plat/asynchronous_file_saving_queue_api/tsrc/group"/>
+ <unit bldFile="/sf/mw/camerasrv/camerasrv_plat/camera_application_engine_api/tsrc/group"/>
+ <unit bldFile="/sf/mw/camerasrv/camerasrv_plat/imaging_configuration_manager_api/tsrc/group"/>
+ <unit bldFile="/sf/mw/camerasrv/camerasrv_plat/media_recorder_api/tsrc/group"/>
+ </component>
+ <component name="camerasrv_build" filter="s60" long-name="Camera Services Build">
+ <!-- should split into individual bld.infs -->
+ <unit bldFile="/sf/mw/camerasrv/group"/>
+ </component>
+ </collection>
+ </block>
+ </layer>
+ </systemModel>
</SystemDefinition>
--- a/symbian3/mw/camerasrv/package_definition_3.0.xml Fri Feb 12 16:37:22 2010 +0000
+++ b/symbian3/mw/camerasrv/package_definition_3.0.xml Mon Feb 15 18:25:55 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 Fri Feb 12 16:37:22 2010 +0000
+++ b/symbian3/mw/classicui/package_definition_3.0.xml Mon Feb 15 18:25:55 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.xml Fri Feb 12 16:37:22 2010 +0000
+++ b/symbian3/mw/dlnasrv/package_definition.xml Mon Feb 15 18:25:55 2010 +0000
@@ -1,139 +1,252 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE SystemDefinition [
- <!ELEMENT SystemDefinition (systemModel?,SystemBuild?)>
- <!ATTLIST SystemDefinition
- name CDATA #REQUIRED
- schema CDATA #REQUIRED>
- <!ELEMENT systemModel (layer+)>
- <!ELEMENT layer (block*|collection*)*>
- <!ATTLIST layer
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED
- levels NMTOKENS #IMPLIED
- span CDATA #IMPLIED>
- <!ELEMENT block (subblock*|collection*)*>
- <!ATTLIST block
- levels NMTOKENS #IMPLIED
- span CDATA #IMPLIED
- level NMTOKEN #IMPLIED
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED>
- <!ELEMENT subblock (collection)*>
- <!ATTLIST subblock
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED>
- <!ELEMENT collection (component)*>
- <!ATTLIST collection
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED
- level NMTOKEN #IMPLIED>
- <!ELEMENT component (unit)*>
- <!ATTLIST component
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED
- deprecated CDATA #IMPLIED
- introduced CDATA #IMPLIED
- contract CDATA #IMPLIED
- plugin (Y|N) 'N'
- filter CDATA #IMPLIED
- class NMTOKENS #IMPLIED
- supports CDATA #IMPLIED
- purpose (optional|mandatory|development) 'optional'>
- <!ELEMENT unit EMPTY>
- <!ATTLIST unit
- mrp CDATA #IMPLIED
- filter CDATA #IMPLIED
- bldFile CDATA #IMPLIED
- root CDATA #IMPLIED
- version NMTOKEN #IMPLIED
- prebuilt NMTOKEN #IMPLIED
- late (Y|N) #IMPLIED
- priority CDATA #IMPLIED>
- <!ELEMENT SystemBuild (option*|target+|targetList+|list+|configuration+)*>
- <!ATTLIST SystemBuild schema CDATA #REQUIRED>
- <!ELEMENT list (ref+)>
- <!ATTLIST list
- name ID #REQUIRED
- description CDATA #REQUIRED>
- <!ELEMENT ref EMPTY>
- <!ATTLIST ref item CDATA #REQUIRED>
- <!ELEMENT targetList EMPTY>
- <!ATTLIST targetList
- name ID #REQUIRED
- description CDATA #REQUIRED
- target IDREFS #REQUIRED>
- <!ELEMENT target EMPTY>
- <!ATTLIST target
- name ID #REQUIRED
- abldTarget CDATA #REQUIRED
- description CDATA #REQUIRED>
- <!ELEMENT option EMPTY>
- <!ATTLIST option
- name ID #REQUIRED
- abldOption CDATA #REQUIRED
- description CDATA #REQUIRED
- enable (Y|N) #REQUIRED>
- <!ELEMENT configuration (listRef+|ref+|task+)*>
- <!ATTLIST configuration
- name ID #REQUIRED
- description CDATA #REQUIRED
- filter CDATA #REQUIRED>
- <!ELEMENT task (listRef*,(buildLayer|specialInstructions))>
- <!ELEMENT listRef EMPTY>
- <!ATTLIST listRef list CDATA #REQUIRED>
- <!ELEMENT buildLayer EMPTY>
- <!ATTLIST buildLayer
- command CDATA #REQUIRED
- targetList IDREFS #IMPLIED
- unitParallel (Y|N) #REQUIRED
- targetParallel (Y|N) 'N'>
- <!ELEMENT specialInstructions EMPTY>
- <!ATTLIST specialInstructions
- name CDATA #REQUIRED
- cwd CDATA #REQUIRED
- root CDATA #IMPLIED
- command CDATA #REQUIRED>
-]>
-<SystemDefinition schema="2.0.1" name="Symbian^3">
-<systemModel>
-<layer name="mw">
-<block name="dlnasrv">
-<collection name="s60">
-<component name="homemedia">
-<unit bldFile="/sf/mw/dlnasrv/homemedia/group" mrp=""/>
-</component>
-<component name="homesync">
-<unit bldFile="/sf/mw/dlnasrv/homesync/group" mrp=""/>
-</component>
-<component name="upnpavcontrolpoint">
-<unit bldFile="/sf/mw/dlnasrv/upnpavcontrolpoint/group" mrp=""/>
-</component>
-<component name="upnpframework">
-<unit bldFile="/sf/mw/dlnasrv/upnpframework/group" mrp=""/>
-</component>
-<component name="upnpharvester">
-<unit bldFile="/sf/mw/dlnasrv/upnpharvester/group" mrp=""/>
-</component>
-<component name="upnpmediaserver">
-<unit bldFile="/sf/mw/dlnasrv/upnpmediaserver/group" mrp=""/>
-</component>
-<component name="upnpavcontroller">
-<unit bldFile="/sf/mw/dlnasrv/upnpavcontroller/group" mrp=""/>
-</component>
-<component name="upnpsharing">
-<unit bldFile="/sf/mw/dlnasrv/upnpsharing/group" mrp=""/>
-</component>
-<component name="upnpsettings">
-<unit bldFile="/sf/mw/dlnasrv/upnpsettings/group" mrp=""/>
-</component>
-<component name="upnpmpxplugins">
-<unit bldFile="/sf/mw/dlnasrv/upnpmpxplugins/group" mrp=""/>
-</component>
-<component name="dlnasrv_plat">
-<unit bldFile="/sf/mw/dlnasrv/dlnasrv_plat/group" mrp=""/>
-</component>
-</collection>
-</block>
-</layer>
-</systemModel>
+<!DOCTYPE SystemDefinition [
+<!ELEMENT SystemDefinition ( systemModel )>
+<!ATTLIST SystemDefinition
+ name CDATA #REQUIRED
+ schema CDATA #REQUIRED
+>
+<!-- all paths are relative to the environment variable specified by the root attribute, or SOURCEROOT if not. -->
+
+<!-- System Model Section of DTD -->
+<!ELEMENT systemModel (layer+)>
+
+<!ELEMENT layer (block* | collection*)*>
+<!-- Kernel Services, Base Services, OS Services, Etc -->
+<!ATTLIST layer
+ name CDATA #REQUIRED
+ long-name CDATA #IMPLIED
+ levels NMTOKENS #IMPLIED
+ span CDATA #IMPLIED
+>
+
+<!ELEMENT block (subblock* | collection*)*>
+ <!-- Generic OS services, Comms Services, etc -->
+<!ATTLIST block
+ levels NMTOKENS #IMPLIED
+ span CDATA #IMPLIED
+ level NMTOKEN #IMPLIED
+ name CDATA #REQUIRED
+ long-name CDATA #IMPLIED
+>
+
+<!ELEMENT subblock (collection)*>
+<!-- Cellular Baseband Services, Networking Services, etc -->
+<!ATTLIST subblock
+ name CDATA #REQUIRED
+ long-name CDATA #IMPLIED
+>
+
+<!ELEMENT collection (component)*>
+<!-- Screen Driver, Content Handling, etc -->
+<!ATTLIST collection
+ name CDATA #REQUIRED
+ long-name CDATA #IMPLIED
+ level NMTOKEN #IMPLIED
+>
+
+<!ELEMENT component (unit)*>
+<!-- contains units or is a package or prebuilt -->
+<!ATTLIST component
+ name CDATA #REQUIRED
+ long-name CDATA #IMPLIED
+ deprecated CDATA #IMPLIED
+ introduced CDATA #IMPLIED
+ contract CDATA #IMPLIED
+ plugin (Y|N) "N"
+ filter CDATA #IMPLIED
+ class NMTOKENS #IMPLIED
+ supports CDATA #IMPLIED
+ purpose ( optional | mandatory | development ) "optional"
+>
+
+<!ELEMENT unit EMPTY >
+<!-- must be buildable (bld.inf) -->
+<!-- bldFile may someday be removed in favour of mrp -->
+<!ATTLIST unit
+ mrp CDATA #IMPLIED
+ filter CDATA #IMPLIED
+ bldFile CDATA #IMPLIED
+ root CDATA #IMPLIED
+ version NMTOKEN #IMPLIED
+ prebuilt NMTOKEN #IMPLIED
+ late (Y|N) #IMPLIED
+ priority CDATA #IMPLIED
+>
+]>
+<SystemDefinition name="Symbian^3" schema="2.0.1">
+ <systemModel>
+ <layer name="mw" long-name="Middleware" levels="generic specific">
+ <block name="dlnasrv" level="specific" long-name="DLNA Services" levels="stack server ctrl framework plugin">
+ <collection name="upnpavcontrolpoint" long-name="UPnP A/V Control Point" level="plugin">
+ <component name="avcontrolframework" filter="s60" long-name="A/V Control Famework" introduced="9.1" deprecated="^3">
+ <unit bldFile="/sf/mw/dlnasrv/upnpavcontrolpoint/avcontrolframework/group"/>
+ </component>
+ <component name="upnpavcontrolpoint_build" filter="s60" long-name="UPnP A/V Control Point Build" introduced="9.1" deprecated="^3">
+ <!-- put exports in other component instead -->
+ <unit bldFile="/sf/mw/dlnasrv/upnpavcontrolpoint/group"/>
+ </component>
+ </collection>
+ <collection name="upnpmediaserver" long-name="UPnP Media Server" level="server">
+ <component name="avobjects" filter="s60" long-name="A/V Objects">
+ <unit bldFile="/sf/mw/dlnasrv/upnpmediaserver/avobjects/group"/>
+ </component>
+ <component name="mediaserverclient" filter="s60" long-name="Media Server Client">
+ <unit bldFile="/sf/mw/dlnasrv/upnpmediaserver/mediaserverclient/group"/>
+ </component>
+ <component name="connectionmanagerservice" filter="s60" long-name="Connection Manager Service">
+ <unit bldFile="/sf/mw/dlnasrv/upnpmediaserver/connectionmanagerservice/group"/>
+ </component>
+ <component name="contentdirectoryservice" filter="s60" long-name="Content Directory Service">
+ <unit bldFile="/sf/mw/dlnasrv/upnpmediaserver/contentdirectoryservice/group"/>
+ </component>
+ <component name="mediaserverengine" filter="s60" long-name="Media Server Engine">
+ <unit bldFile="/sf/mw/dlnasrv/upnpmediaserver/mediaserverengine/group"/>
+ </component>
+ <component name="upnpmediaserver_build" filter="s60" long-name="UPnP Media Server Build">
+ <!-- move exports into one of above components -->
+ <unit bldFile="/sf/mw/dlnasrv/upnpmediaserver/group"/>
+ </component>
+ </collection>
+ <collection name="upnpavcontroller" long-name="UPnP A/V Controller" level="ctrl">
+ <component name="upnpxmlparser" filter="s60" long-name="UPnP XML Parser" introduced="^2">
+ <unit bldFile="/sf/mw/dlnasrv/upnpavcontroller/upnpxmlparser/group"/>
+ </component>
+ <component name="upnpavcontrollerserver" filter="s60" long-name="UPnP A/V Controller Server" introduced="^2">
+ <unit bldFile="/sf/mw/dlnasrv/upnpavcontroller/upnpavcontrollerserver/group"/>
+ </component>
+ <component name="upnpavcontrollerclient" filter="s60" long-name="UPnP A/V Ccontroller Client" introduced="^2">
+ <unit bldFile="/sf/mw/dlnasrv/upnpavcontroller/upnpavcontrollerclient/group"/>
+ </component>
+ <component name="upnpavcontrollerhelper" filter="s60" long-name="UPnP A/V Controller Helper" introduced="^2">
+ <unit bldFile="/sf/mw/dlnasrv/upnpavcontroller/upnpavcontrollerhelper/group"/>
+ </component>
+ <component name="upnpavcontroller_build" filter="s60" long-name="UPnP A/V Controller Build" introduced="^2">
+ <!-- move exports content into one of above components -->
+ <unit bldFile="/sf/mw/dlnasrv/upnpavcontroller/group"/>
+ </component>
+ </collection>
+ <collection name="upnpframework" long-name="UPnP Framework" level="framework">
+ <component name="upnputilities" filter="s60" long-name="UPnP Utilities" introduced="^2">
+ <unit bldFile="/sf/mw/dlnasrv/upnpframework/upnputilities/group"/>
+ </component>
+ <component name="upnpextensionpluginif" filter="s60" long-name="UPnP Home Media Extension Plugin Interface" introduced="^2" deprecated="^3">
+ <unit bldFile="/sf/mw/dlnasrv/upnpframework/upnpextensionpluginif/group"/>
+ </component>
+ <component name="upnpfiletransferengine" filter="s60" long-name="UPnP File Transfer Engine" introduced="^2" deprecated="^3">
+ <unit bldFile="/sf/mw/dlnasrv/upnpframework/upnpfiletransferengine/group"/>
+ </component>
+ <component name="upnpcommonui" filter="s60" long-name="UPnP Common UI" introduced="^2" deprecated="^3">
+ <unit bldFile="/sf/mw/dlnasrv/upnpframework/upnpcommonui/group"/>
+ </component>
+ <component name="upnpaiwengine" filter="s60" long-name="UPnP AIW Engine" introduced="^2" deprecated="^3">
+ <unit bldFile="/sf/mw/dlnasrv/upnpframework/upnpaiwengine/group"/>
+ </component>
+ <component name="upnpaiwprovider" filter="s60" long-name="UPnP AIW Provider" introduced="^2" deprecated="^3" plugin="Y">
+ <unit bldFile="/sf/mw/dlnasrv/upnpframework/upnpaiwprovider/group"/>
+ </component>
+ <component name="upnpmusicadapter" filter="s60" long-name="UPnP Music Adapter" introduced="^2">
+ <unit bldFile="/sf/mw/dlnasrv/upnpframework/upnpmusicadapter/group"/>
+ </component>
+ <component name="upnpcommand" filter="s60" long-name="UPnP Command" introduced="^2">
+ <unit bldFile="/sf/mw/dlnasrv/upnpframework/upnpcommand/group"/>
+ </component>
+ <component name="upnpframework_build" filter="s60" long-name="UPnP Framework Build" introduced="^2">
+ <!-- move exports content into one of above components -->
+ <unit bldFile="/sf/mw/dlnasrv/upnpframework/group"/>
+ </component>
+ </collection>
+ <collection name="upnpsettings" long-name="UPnP Settings" level="framework">
+ <component name="upnpsettingsengine" filter="s60" long-name="UPnP Settings Engine" introduced="^2">
+ <unit bldFile="/sf/mw/dlnasrv/upnpsettings/upnpsettingsengine/group"/>
+ </component>
+ <component name="multiselectionui" filter="s60" long-name="Multi-Selection UI" introduced="^2" deprecated="^3">
+ <unit bldFile="/sf/mw/dlnasrv/upnpsettings/multiselectionui/group"/>
+ </component>
+ <component name="appwizard" filter="s60" long-name="UPnP Settings Wizard App" introduced="^2" deprecated="^3">
+ <unit bldFile="/sf/mw/dlnasrv/upnpsettings/appwizard/group"/>
+ </component>
+ <component name="upnpsharingui" filter="s60" long-name="UPnP Sharing UI" introduced="^2" deprecated="^3">
+ <unit bldFile="/sf/mw/dlnasrv/upnpsettings/upnpsharingui/group"/>
+ </component>
+ <component name="upnpgsplugin" filter="s60" long-name="UPnP GS Plugin" introduced="^2" plugin="Y">
+ <unit bldFile="/sf/mw/dlnasrv/upnpsettings/upnpgsplugin/group"/>
+ </component>
+ <component name="upnpsettings_build" filter="s60" long-name="UPnP Settings Build" introduced="^2">
+ <!-- move exports content into one of above components -->
+ <unit bldFile="/sf/mw/dlnasrv/upnpsettings/group"/>
+ </component>
+ </collection>
+ <collection name="upnpsharing" long-name="UPnP Sharing" level="server">
+ <component name="upnpdlnaprofiler" filter="s60" long-name="UPnP DLNA Profiler" introduced="^2">
+ <unit bldFile="/sf/mw/dlnasrv/upnpsharing/upnpdlnaprofiler/group"/>
+ </component>
+ <component name="upnpsecurity" filter="s60" long-name="UPnP Security" introduced="^2">
+ <unit bldFile="/sf/mw/dlnasrv/upnpsharing/upnpsecurity/group"/>
+ </component>
+ <component name="upnpcontentserver" filter="s60" long-name="UPnP Content Server" introduced="^2">
+ <unit bldFile="/sf/mw/dlnasrv/upnpsharing/upnpcontentserver/group"/>
+ </component>
+ <component name="applicationengine" filter="s60" long-name="UPnP Application Engine" introduced="^2">
+ <unit bldFile="/sf/mw/dlnasrv/upnpsharing/applicationengine/group"/>
+ </component>
+ <component name="upnpsharing_build" filter="s60" long-name="UPnP Sharing Build" introduced="^2">
+ <!-- move exports content into one of above components -->
+ <unit bldFile="/sf/mw/dlnasrv/upnpsharing/group"/>
+ </component>
+ </collection>
+ <collection name="upnpmpxplugins" long-name="UPnP MPX Plugins" level="plugin">
+ <component name="upnpplaybackplugins" filter="s60" long-name="UPnP Playback Plugins" introduced="^2" plugin="Y">
+ <unit bldFile="/sf/mw/dlnasrv/upnpmpxplugins/upnpplaybackplugins/group"/>
+ </component>
+ <component name="upnpmpxplugins_build" filter="s60" long-name="UPnP MPX Plugins Build" introduced="^2">
+ <!-- move exports content into other component? -->
+ <unit bldFile="/sf/mw/dlnasrv/upnpmpxplugins/group"/>
+ </component>
+ </collection>
+ <collection name="upnpharvester" long-name="UPnP Harvester" level="ctrl">
+ <component name="upnpharvester_common" filter="s60" long-name="UPnP Harvester Common" introduced="^2" deprecated="^3">
+ <!-- need to merge or #include these to a single bld.inf -->
+ <unit bldFile="/sf/mw/dlnasrv/upnpharvester/common/cmlibrary/group"/>
+ <unit bldFile="/sf/mw/dlnasrv/upnpharvester/common/cmsettings/group"/>
+ <unit bldFile="/sf/mw/dlnasrv/upnpharvester/common/cmsqlwrapper/group"/>
+ <unit bldFile="/sf/mw/dlnasrv/upnpharvester/common/dbmanager/group"/>
+ </component>
+ <component name="cdssync" filter="s60" long-name="CDS Sync" introduced="^2" deprecated="^3">
+ <unit bldFile="/sf/mw/dlnasrv/upnpharvester/cdssync/common"/>
+ </component>
+ <component name="mdhserver" filter="s60" long-name="Metadata Harvester Server" introduced="^2" deprecated="^3">
+ <unit bldFile="/sf/mw/dlnasrv/upnpharvester/mdhserver/group"/>
+ </component>
+ <component name="upnpharvester_build" filter="s60" long-name="UPnP Harvester Build" introduced="^2" deprecated="^3">
+ <!-- could just make the whole collection one component and move down a dir. Or move the exports here into the other component -->
+ <unit bldFile="/sf/mw/dlnasrv/upnpharvester/group"/>
+ </component>
+ </collection>
+ <collection name="homesync" long-name="Home Sync" level="plugin">
+ <component name="contentmanager" filter="s60" long-name="Content Manager" introduced="^2" deprecated="^3">
+ <unit bldFile="/sf/mw/dlnasrv/homesync/group"/>
+ <!-- move bld.inf into contentmanager dir -->
+ </component>
+ </collection>
+ <collection name="homemedia" long-name="Home Media" level="framework">
+ <!-- collection is really just a component. Move down a directory -->
+ <component name="homemedia_build" filter="s60" long-name="Home Media" introduced="^2" deprecated="^3">
+ <unit bldFile="/sf/mw/dlnasrv/homemedia/group"/>
+ </component>
+ </collection>
+ <collection name="dlnasrv_info" long-name="DLNA Services Info" level="plugin">
+ <component name="dlnasrv_plat" filter="s60" long-name="DLNA Services Platform Interfaces" class="api">
+ <unit bldFile="/sf/mw/dlnasrv/dlnasrv_plat/group"/>
+ </component>
+ <component name="dlnasrv_build" filter="s60" long-name="DLNA Services Build">
+ <!-- need to #include upnpplatformvar.hrh from each #included bld.inf, then this can be removed -->
+ <unit bldFile="/sf/mw/dlnasrv/group"/>
+ </component>
+ <component name="dlnasrv_api_test" filter="s60,api_test" long-name="DLNA Services API Tests" purpose="development">
+ <unit bldFile="/sf/mw/dlnasrv/tsrc/group"/>
+ </component>
+ </collection>
+ </block>
+ </layer>
+ </systemModel>
</SystemDefinition>
--- a/symbian3/mw/dlnasrv/package_definition_3.0.xml Fri Feb 12 16:37:22 2010 +0000
+++ b/symbian3/mw/dlnasrv/package_definition_3.0.xml Mon Feb 15 18:25:55 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 Fri Feb 12 16:37:22 2010 +0000
+++ b/symbian3/mw/drm/package_definition_3.0.xml Mon Feb 15 18:25:55 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 Fri Feb 12 16:37:22 2010 +0000
+++ b/symbian3/mw/gsprofilesrv/package_definition_3.0.xml Mon Feb 15 18:25:55 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 Fri Feb 12 16:37:22 2010 +0000
+++ b/symbian3/mw/hapticsservices/package_definition_3.0.xml Mon Feb 15 18:25:55 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/helix/package_definition.xml Fri Feb 12 16:37:22 2010 +0000
+++ b/symbian3/mw/helix/package_definition.xml Mon Feb 15 18:25:55 2010 +0000
@@ -76,7 +76,14 @@
<SystemDefinition name="Symbian^3" schema="2.0.1">
<systemModel>
<layer name="mw" long-name="Middleware" levels="generic specific">
- <block name="helix" level="generic" long-name="../../../../mw/helix/package_definition.xml"/>
+ <block name="helix" level="generic" long-name="Helix" levels="plugin framework server generic specific">
+ <collection name="helix_ren" long-name="Helix Engine" level="framework">
+ <!-- what does "ren" stand for? -->
+ <component name="helix_stub" filter="s60" long-name="Helix Stub" introduced="^2" class="api">
+ <unit bldFile="/sf/mw/helix/helix_ren/helix_stub/group"/>
+ </component>
+ </collection>
+ </block>
</layer>
</systemModel>
</SystemDefinition>
--- a/symbian3/mw/homescreensrv/package_definition_3.0.xml Fri Feb 12 16:37:22 2010 +0000
+++ b/symbian3/mw/homescreensrv/package_definition_3.0.xml Mon Feb 15 18:25:55 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 Fri Feb 12 16:37:22 2010 +0000
+++ b/symbian3/mw/imghandling/package_definition_3.0.xml Mon Feb 15 18:25:55 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 Fri Feb 12 16:37:22 2010 +0000
+++ b/symbian3/mw/imsrv/package_definition_3.0.xml Mon Feb 15 18:25:55 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 Fri Feb 12 16:37:22 2010 +0000
+++ b/symbian3/mw/inputmethods/package_definition_3.0.xml Mon Feb 15 18:25:55 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 Fri Feb 12 16:37:22 2010 +0000
+++ b/symbian3/mw/ipappprotocols/package_definition_3.0.xml Mon Feb 15 18:25:55 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 Fri Feb 12 16:37:22 2010 +0000
+++ b/symbian3/mw/ipappsrv/package_definition_3.0.xml Mon Feb 15 18:25:55 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 Fri Feb 12 16:37:22 2010 +0000
+++ b/symbian3/mw/ipconnmgmt/package_definition_3.0.xml Mon Feb 15 18:25:55 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 Fri Feb 12 16:37:22 2010 +0000
+++ b/symbian3/mw/legacypresence/package_definition_3.0.xml Mon Feb 15 18:25:55 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 Fri Feb 12 16:37:22 2010 +0000
+++ b/symbian3/mw/locationsrv/package_definition_3.0.xml Mon Feb 15 18:25:55 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 Fri Feb 12 16:37:22 2010 +0000
+++ b/symbian3/mw/mds/package_definition_3.0.xml Mon Feb 15 18:25:55 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 Fri Feb 12 16:37:22 2010 +0000
+++ b/symbian3/mw/messagingmw/package_definition_3.0.xml Mon Feb 15 18:25:55 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 Fri Feb 12 16:37:22 2010 +0000
+++ b/symbian3/mw/metadatasrv/package_definition_3.0.xml Mon Feb 15 18:25:55 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 Fri Feb 12 16:37:22 2010 +0000
+++ b/symbian3/mw/mmappfw/package_definition_3.0.xml Mon Feb 15 18:25:55 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.xml Fri Feb 12 16:37:22 2010 +0000
+++ b/symbian3/mw/mmmw/package_definition.xml Mon Feb 15 18:25:55 2010 +0000
@@ -1,146 +1,150 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE SystemDefinition [
- <!ELEMENT SystemDefinition (systemModel?,SystemBuild?)>
- <!ATTLIST SystemDefinition
- name CDATA #REQUIRED
- schema CDATA #REQUIRED>
- <!ELEMENT systemModel (layer+)>
- <!ELEMENT layer (block*|collection*)*>
- <!ATTLIST layer
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED
- levels NMTOKENS #IMPLIED
- span CDATA #IMPLIED>
- <!ELEMENT block (subblock*|collection*)*>
- <!ATTLIST block
- levels NMTOKENS #IMPLIED
- span CDATA #IMPLIED
- level NMTOKEN #IMPLIED
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED>
- <!ELEMENT subblock (collection)*>
- <!ATTLIST subblock
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED>
- <!ELEMENT collection (component)*>
- <!ATTLIST collection
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED
- level NMTOKEN #IMPLIED>
- <!ELEMENT component (unit)*>
- <!ATTLIST component
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED
- deprecated CDATA #IMPLIED
- introduced CDATA #IMPLIED
- contract CDATA #IMPLIED
- plugin (Y|N) 'N'
- filter CDATA #IMPLIED
- class NMTOKENS #IMPLIED
- supports CDATA #IMPLIED
- purpose (optional|mandatory|development) 'optional'>
- <!ELEMENT unit EMPTY>
- <!ATTLIST unit
- mrp CDATA #IMPLIED
- filter CDATA #IMPLIED
- bldFile CDATA #IMPLIED
- root CDATA #IMPLIED
- version NMTOKEN #IMPLIED
- prebuilt NMTOKEN #IMPLIED
- late (Y|N) #IMPLIED
- priority CDATA #IMPLIED>
- <!ELEMENT SystemBuild (option*|target+|targetList+|list+|configuration+)*>
- <!ATTLIST SystemBuild schema CDATA #REQUIRED>
- <!ELEMENT list (ref+)>
- <!ATTLIST list
- name ID #REQUIRED
- description CDATA #REQUIRED>
- <!ELEMENT ref EMPTY>
- <!ATTLIST ref item CDATA #REQUIRED>
- <!ELEMENT targetList EMPTY>
- <!ATTLIST targetList
- name ID #REQUIRED
- description CDATA #REQUIRED
- target IDREFS #REQUIRED>
- <!ELEMENT target EMPTY>
- <!ATTLIST target
- name ID #REQUIRED
- abldTarget CDATA #REQUIRED
- description CDATA #REQUIRED>
- <!ELEMENT option EMPTY>
- <!ATTLIST option
- name ID #REQUIRED
- abldOption CDATA #REQUIRED
- description CDATA #REQUIRED
- enable (Y|N) #REQUIRED>
- <!ELEMENT configuration (listRef+|ref+|task+)*>
- <!ATTLIST configuration
- name ID #REQUIRED
- description CDATA #REQUIRED
- filter CDATA #REQUIRED>
- <!ELEMENT task (listRef*,(buildLayer|specialInstructions))>
- <!ELEMENT listRef EMPTY>
- <!ATTLIST listRef list CDATA #REQUIRED>
- <!ELEMENT buildLayer EMPTY>
- <!ATTLIST buildLayer
- command CDATA #REQUIRED
- targetList IDREFS #IMPLIED
- unitParallel (Y|N) #REQUIRED
- targetParallel (Y|N) 'N'>
- <!ELEMENT specialInstructions EMPTY>
- <!ATTLIST specialInstructions
- name CDATA #REQUIRED
- cwd CDATA #REQUIRED
- root CDATA #IMPLIED
- command CDATA #REQUIRED>
-]>
-<SystemDefinition schema="2.0.1" name="Symbian^3">
-<systemModel>
-<layer name="mw" long-name="Middleware" levels="generic specific">
-<block name="mmmw" level="generic" long-name="Multimedia Middleware" levels="plugin framework server generic specific">
-<collection name="mmmiddlewarefws" long-name="Multimedia Middleware Frameworks" level="server">
-<component name="mmfw" long-name="Multimedia Framework" introduced="7.0s" purpose="mandatory">
-<unit bldFile="/sf/mw/mmmw/mmmiddlewarefws/mmfw/group" mrp="/sf/mw/mmmw/mmmiddlewarefws/mmfw/group/multimedia_mmf.mrp"/>
-</component>
-</collection>
-<collection name="mmmiddlewareplugins" long-name="Multimedia Middleware Plugins" level="framework">
-<component name="mmfwplugins" long-name="Multimedia Framework Plugins" introduced="7.0s" purpose="optional" plugin="Y">
-<unit bldFile="/sf/mw/mmmw/mmmiddlewarefws/mmfw/group_plugin" mrp="/sf/mw/mmmw/mmmiddlewarefws/mmfw/group_plugin/multimedia_mmf_plugin.mrp"/>
-</component>
-</collection>
-<collection name="mmfwtest" long-name="Multimedia Framework Test" level="server">
-<component name="mmfunittest" long-name="MMF Unit Tests" introduced="7.0s" purpose="development">
-<unit mrp="/sf/mw/mmmw/mmfwtest/mmfunittest/group/multimedia_unittest_mmf_source.mrp"/>
-</component>
-<component name="mmfintegrationtest" long-name="MMF Integration Tests" introduced="7.0s" purpose="development">
-<unit mrp="/sf/mw/mmmw/mmfwtest/mmfintegrationtest/group/multimedia_inttest_mmf_source.mrp"/>
-</component>
-<component name="mmfcharacterisationvalidation" long-name="MMF Characterisation Validation" introduced="9.3" purpose="development">
-<unit bldFile="/sf/mw/mmmw/mmfwtest/mmfcharacterisationvalidation/group" mrp="/sf/mw/mmmw/mmfwtest/mmfcharacterisationvalidation/group/multimedia_mmf_char.mrp"/>
-</component>
-</collection>
-<collection name="mmvalidationsuite" long-name="Multimedia Validation Suite" level="specific">
-<component name="mmvalidationsuiteapp" long-name="Multimedia Validation Suite Application" introduced="tb91" purpose="development">
-<unit bldFile="/sf/mw/mmmw/mmvalidationsuite/mmvalidationsuiteapp/group" mrp="/sf/mw/mmmw/mmvalidationsuite/mmvalidationsuiteapp/group/multimedia_mvs_app.mrp"/>
-</component>
-<component name="mmvalidationsuiteagents" long-name="Multimedia Validation Suite Agents" introduced="tb91" purpose="development">
-<unit bldFile="/sf/mw/mmmw/mmvalidationsuite/mmvalidationsuiteagents/group" mrp="/sf/mw/mmmw/mmvalidationsuite/mmvalidationsuiteagents/group/multimedia_mvs_agents.mrp"/>
-</component>
-<component name="mvsintegrationtest" long-name="MVS Integration Tests" introduced="tb91" purpose="development">
-<unit mrp="/sf/mw/mmmw/mmvalidationsuite/mvsintegrationtest/group/multimedia_inttest_mvs_source.mrp"/>
-</component>
-</collection>
-<collection name="mmmw_info" long-name="Multimedia Middleware Info" level="specific">
-<component name="mmmw_metadata" long-name="Multimedia Middleware Metadata" introduced="tb91" purpose="development" class="config PC">
-<unit mrp="/sf/mw/mmmw/mmmw_info/mmmw_metadata/mmmw_metadata.mrp"/>
-</component>
-</collection>
-<collection name="s60">
-<component name="mmmw">
-<unit bldFile="/sf/mw/mmmw/group" mrp=""/>
-</component>
-</collection>
-</block>
-</layer>
-</systemModel>
-</SystemDefinition>
\ No newline at end of file
+<!DOCTYPE SystemDefinition [
+<!ELEMENT SystemDefinition ( systemModel )>
+<!ATTLIST SystemDefinition
+ name CDATA #REQUIRED
+ schema CDATA #REQUIRED
+>
+<!-- all paths are relative to the environment variable specified by the root attribute, or SOURCEROOT if not. -->
+
+<!-- System Model Section of DTD -->
+<!ELEMENT systemModel (layer+)>
+
+<!ELEMENT layer (block* | collection*)*>
+<!-- Kernel Services, Base Services, OS Services, Etc -->
+<!ATTLIST layer
+ name CDATA #REQUIRED
+ long-name CDATA #IMPLIED
+ levels NMTOKENS #IMPLIED
+ span CDATA #IMPLIED
+>
+
+<!ELEMENT block (subblock* | collection*)*>
+ <!-- Generic OS services, Comms Services, etc -->
+<!ATTLIST block
+ levels NMTOKENS #IMPLIED
+ span CDATA #IMPLIED
+ level NMTOKEN #IMPLIED
+ name CDATA #REQUIRED
+ long-name CDATA #IMPLIED
+>
+
+<!ELEMENT subblock (collection)*>
+<!-- Cellular Baseband Services, Networking Services, etc -->
+<!ATTLIST subblock
+ name CDATA #REQUIRED
+ long-name CDATA #IMPLIED
+>
+
+<!ELEMENT collection (component)*>
+<!-- Screen Driver, Content Handling, etc -->
+<!ATTLIST collection
+ name CDATA #REQUIRED
+ long-name CDATA #IMPLIED
+ level NMTOKEN #IMPLIED
+>
+
+<!ELEMENT component (unit)*>
+<!-- contains units or is a package or prebuilt -->
+<!ATTLIST component
+ name CDATA #REQUIRED
+ long-name CDATA #IMPLIED
+ deprecated CDATA #IMPLIED
+ introduced CDATA #IMPLIED
+ contract CDATA #IMPLIED
+ plugin (Y|N) "N"
+ filter CDATA #IMPLIED
+ class NMTOKENS #IMPLIED
+ supports CDATA #IMPLIED
+ purpose ( optional | mandatory | development ) "optional"
+>
+
+<!ELEMENT unit EMPTY >
+<!-- must be buildable (bld.inf) -->
+<!-- bldFile may someday be removed in favour of mrp -->
+<!ATTLIST unit
+ mrp CDATA #IMPLIED
+ filter CDATA #IMPLIED
+ bldFile CDATA #IMPLIED
+ root CDATA #IMPLIED
+ version NMTOKEN #IMPLIED
+ prebuilt NMTOKEN #IMPLIED
+ late (Y|N) #IMPLIED
+ priority CDATA #IMPLIED
+>
+]>
+<SystemDefinition name="Symbian^3" schema="2.0.1">
+ <systemModel>
+ <layer name="mw" long-name="Middleware" levels="generic specific">
+ <block name="mmmw" level="generic" long-name="Multimedia Middleware" levels="plugin framework server generic specific">
+ <collection name="mmfenh" long-name="MMF Enhancements" level="generic">
+ <component name="advancedaudiocontroller" filter="s60" long-name="Advanced Audio Controllers" plugin="Y">
+ <unit bldFile="/sf/mw/mmmw/mmfenh/advancedaudiocontroller/group"/>
+ </component>
+ <component name="audiooutputcontrolutility" filter="s60" long-name="Audio Output Control Utility">
+ <unit bldFile="/sf/mw/mmmw/mmfenh/audiooutputcontrolutility/group"/>
+ </component>
+ <component name="configurationcomponentsfactory" filter="s60" long-name="Configuration Components Factory">
+ <unit bldFile="/sf/mw/mmmw/mmfenh/configurationcomponentsfactory/group"/>
+ </component>
+ <component name="enhancedaudioplayerutility" filter="s60" long-name="Enhanced Audio Player Utility">
+ <unit bldFile="/sf/mw/mmmw/mmfenh/enhancedaudioplayerutility/group"/>
+ </component>
+ <component name="enhancedmediaclient" filter="s60" long-name="Enhanced Media Client">
+ <unit bldFile="/sf/mw/mmmw/mmfenh/enhancedmediaclient/group"/>
+ </component>
+ <component name="profilesettingsmonitor" filter="s60" long-name="Profile Settings Monitor">
+ <unit bldFile="/sf/mw/mmmw/mmfenh/profilesettingsmonitor/group"/>
+ </component>
+ <component name="progressivedownload" filter="s60" long-name="Progressive Download">
+ <unit bldFile="/sf/mw/mmmw/mmfenh/progressivedownload/group"/>
+ </component>
+ <component name="mmfenh_test" filter="s60,module_test,pref_test" long-name="MMF Enhancements Tests" purpose="development">
+ <unit bldFile="/sf/mw/mmmw/mmfenh/advancedaudiocontroller/tsrc/advancedaudiocontrollertestmodule/group"/>
+ </component>
+ </collection>
+ <collection name="mm_fw" long-name="Multimedia Frameworks" level="framework">
+ <!-- Id needs to be unique, mmfw already in use -->
+ <!-- Placeholder for OpenAX AL and other stuff -->
+ </collection>
+ <collection name="mmserv" long-name="Multimedia Services" level="specific">
+ <component name="audioeffectsui" filter="s60" long-name="Audio Effects UI">
+ <unit bldFile="/sf/mw/mmmw/mmserv/audioeffectsui/group"/>
+ </component>
+ <component name="callaudiocontrol" filter="s60" long-name="Call Audio Control">
+ <unit bldFile="/sf/mw/mmmw/mmserv/callaudiocontrol/group"/>
+ </component>
+ <component name="metadatautility" filter="s60" long-name="Metadata Utility">
+ <unit bldFile="/sf/mw/mmmw/mmserv/metadatautility/group"/>
+ </component>
+ <component name="radioutility" filter="s60" long-name="Radio Utility">
+ <unit bldFile="/sf/mw/mmmw/mmserv/radioutility/group"/>
+ </component>
+ <component name="thumbnailengine" filter="s60" long-name="Thumbnail Engine" introduced="^2">
+ <unit bldFile="/sf/mw/mmmw/mmserv/thumbnailengine/group"/>
+ </component>
+ <component name="tms" filter="s60" long-name="Telephony Multimedia Service" introduced="^3">
+ <unit bldFile="/sf/mw/mmmw/mmserv/tms/group"/>
+ </component>
+ <component name="voipaudioservices" filter="s60" long-name="VoIP Audio Services">
+ <unit bldFile="/sf/mw/mmmw/mmserv/voipaudioservices/group"/>
+ </component>
+ </collection>
+ <collection name="mmmw_info" long-name="Multimedia Middleware Info" level="specific">
+ <component name="mmmw_test" filter="s60,api_test,pref_test" long-name="Multimedia Middleware Tests" purpose="development">
+ <unit bldFile="/sf/mw/mmmw/tsrc/group"/>
+ </component>
+ <component name="mmmw_api_test" filter="s60,api_test" long-name="Multimedia Middleware API Tests" purpose="development">
+ <unit bldFile="/sf/mw/mmmw/mmmw_plat/telephony_multimedia_service_api/tsrc/group"/>
+ </component>
+ <component name="mmmw_plat" filter="s60" long-name="Multimedia Middleware Platform Interfaces" class="api">
+ <unit bldFile="/sf/mw/mmmw/mmmw_plat/group"/>
+ </component>
+ <component name="mmmw_metadata" long-name="Multimedia Middleware Metadata" introduced="^2" purpose="development" class="config PC">
+ <unit mrp="/sf/mw/mmmw/mmmw_info/mmmw_metadata/mmmw_metadata.mrp"/>
+ </component>
+ </collection>
+ </block>
+ </layer>
+ </systemModel>
+</SystemDefinition>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/symbian3/mw/mmmw/package_definition_3.0.xml Mon Feb 15 18:25:55 2010 +0000
@@ -0,0 +1,72 @@
+<?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="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="audiooutputcontrolutility" filter="s60" name="Audio Output Control Utility">
+ <unit bldFile="mmfenh/audiooutputcontrolutility/group"/>
+ </component>
+ <component id="configurationcomponentsfactory" filter="s60" name="Configuration Components Factory">
+ <unit bldFile="mmfenh/configurationcomponentsfactory/group"/>
+ </component>
+ <component id="enhancedaudioplayerutility" filter="s60" name="Enhanced Audio Player Utility">
+ <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="mmfenh/progressivedownload/group"/>
+ </component>
+ <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="mmserv/callaudiocontrol/group"/>
+ </component>
+ <component id="metadatautility" filter="s60" name="Metadata Utility">
+ <unit bldFile="mmserv/metadatautility/group"/>
+ </component>
+ <component id="radioutility" filter="s60" name="Radio Utility">
+ <unit bldFile="mmserv/radioutility/group"/>
+ </component>
+ <component id="thumbnailengine" filter="s60" name="Thumbnail Engine" introduced="^2">
+ <unit bldFile="mmserv/thumbnailengine/group"/>
+ </component>
+ <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>
+ </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>
+ <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/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"/>
+ </component>
+ </collection>
+ </package>
+</SystemDefinition>
--- a/symbian3/mw/mmuifw/package_definition_3.0.xml Fri Feb 12 16:37:22 2010 +0000
+++ b/symbian3/mw/mmuifw/package_definition_3.0.xml Mon Feb 15 18:25:55 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/netprotocols/package_definition.xml Fri Feb 12 16:37:22 2010 +0000
+++ b/symbian3/mw/netprotocols/package_definition.xml Mon Feb 15 18:25:55 2010 +0000
@@ -1,148 +1,157 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE SystemDefinition [
- <!ELEMENT SystemDefinition (systemModel?,SystemBuild?)>
- <!ATTLIST SystemDefinition
- name CDATA #REQUIRED
- schema CDATA #REQUIRED>
- <!ELEMENT systemModel (layer+)>
- <!ELEMENT layer (block*|collection*)*>
- <!ATTLIST layer
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED
- levels NMTOKENS #IMPLIED
- span CDATA #IMPLIED>
- <!ELEMENT block (subblock*|collection*)*>
- <!ATTLIST block
- levels NMTOKENS #IMPLIED
- span CDATA #IMPLIED
- level NMTOKEN #IMPLIED
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED>
- <!ELEMENT subblock (collection)*>
- <!ATTLIST subblock
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED>
- <!ELEMENT collection (component)*>
- <!ATTLIST collection
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED
- level NMTOKEN #IMPLIED>
- <!ELEMENT component (unit)*>
- <!ATTLIST component
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED
- deprecated CDATA #IMPLIED
- introduced CDATA #IMPLIED
- contract CDATA #IMPLIED
- plugin (Y|N) 'N'
- filter CDATA #IMPLIED
- class NMTOKENS #IMPLIED
- supports CDATA #IMPLIED
- purpose (optional|mandatory|development) 'optional'>
- <!ELEMENT unit EMPTY>
- <!ATTLIST unit
- mrp CDATA #IMPLIED
- filter CDATA #IMPLIED
- bldFile CDATA #IMPLIED
- root CDATA #IMPLIED
- version NMTOKEN #IMPLIED
- prebuilt NMTOKEN #IMPLIED
- late (Y|N) #IMPLIED
- priority CDATA #IMPLIED>
- <!ELEMENT SystemBuild (option*|target+|targetList+|list+|configuration+)*>
- <!ATTLIST SystemBuild schema CDATA #REQUIRED>
- <!ELEMENT list (ref+)>
- <!ATTLIST list
- name ID #REQUIRED
- description CDATA #REQUIRED>
- <!ELEMENT ref EMPTY>
- <!ATTLIST ref item CDATA #REQUIRED>
- <!ELEMENT targetList EMPTY>
- <!ATTLIST targetList
- name ID #REQUIRED
- description CDATA #REQUIRED
- target IDREFS #REQUIRED>
- <!ELEMENT target EMPTY>
- <!ATTLIST target
- name ID #REQUIRED
- abldTarget CDATA #REQUIRED
- description CDATA #REQUIRED>
- <!ELEMENT option EMPTY>
- <!ATTLIST option
- name ID #REQUIRED
- abldOption CDATA #REQUIRED
- description CDATA #REQUIRED
- enable (Y|N) #REQUIRED>
- <!ELEMENT configuration (listRef+|ref+|task+)*>
- <!ATTLIST configuration
- name ID #REQUIRED
- description CDATA #REQUIRED
- filter CDATA #REQUIRED>
- <!ELEMENT task (listRef*,(buildLayer|specialInstructions))>
- <!ELEMENT listRef EMPTY>
- <!ATTLIST listRef list CDATA #REQUIRED>
- <!ELEMENT buildLayer EMPTY>
- <!ATTLIST buildLayer
- command CDATA #REQUIRED
- targetList IDREFS #IMPLIED
- unitParallel (Y|N) #REQUIRED
- targetParallel (Y|N) 'N'>
- <!ELEMENT specialInstructions EMPTY>
- <!ATTLIST specialInstructions
- name CDATA #REQUIRED
- cwd CDATA #REQUIRED
- root CDATA #IMPLIED
- command CDATA #REQUIRED>
-]>
-<SystemDefinition schema="2.0.1" name="Symbian^3">
-<systemModel>
-<layer name="mw" long-name="Middleware" levels="generic specific">
-<block name="netprotocols" level="generic" long-name="High-level Internet Protocols" levels="plugin framework server generic specific">
-<collection name="applayerprotocols" long-name="Application Layer Protocols" level="server">
-<component name="httptransportfw" long-name="HTTP Transport Framework" introduced="6.2" purpose="optional">
-<unit bldFile="/sf/mw/netprotocols/applayerprotocols/httptransportfw/group" mrp="/sf/mw/netprotocols/applayerprotocols/httptransportfw/group/http_transport-framework.mrp"/>
-</component>
-<component name="httpexamples" long-name="HTTP Examples" introduced="6.2" purpose="development">
-<unit bldFile="/sf/mw/netprotocols/applayerprotocols/httpexamples/group" mrp="/sf/mw/netprotocols/applayerprotocols/httpexamples/group/http_examples.mrp"/>
-</component>
-<component name="wappushsupport" long-name="WAP Push Support" introduced="6.2" purpose="optional">
-<unit bldFile="/sf/mw/netprotocols/applayerprotocols/wappushsupport/Group" mrp="/sf/mw/netprotocols/applayerprotocols/wappushsupport/Group/wap-browser_wappushsupport.mrp"/>
-</component>
-<component name="wapbase" long-name="WAP Base" introduced="6.0" purpose="optional">
-<unit bldFile="/sf/mw/netprotocols/applayerprotocols/wapbase/Group" mrp="/sf/mw/netprotocols/applayerprotocols/wapbase/Group/wap-browser_wapbase.mrp"/>
-</component>
-<component name="ftpengine" long-name="FTP Engine" introduced="6.0" purpose="optional">
-<unit bldFile="/sf/mw/netprotocols/applayerprotocols/ftpengine/group" mrp="/sf/mw/netprotocols/applayerprotocols/ftpengine/group/networking_ftp_e.mrp"/>
-</component>
-<component name="telnetengine" long-name="Telnet Engine" introduced="6.0" purpose="optional">
-<unit bldFile="/sf/mw/netprotocols/applayerprotocols/telnetengine/group" mrp="/sf/mw/netprotocols/applayerprotocols/telnetengine/group/networking_telnet_e.mrp"/>
-</component>
-</collection>
-<collection name="applayerpluginsandutils" long-name="Application Layer Plugins and Utils" level="framework">
-<component name="uripermissionservices" long-name="URI Permission Services" introduced="tb91" purpose="optional">
-<unit bldFile="/sf/mw/netprotocols/applayerpluginsandutils/uripermissionservices/group" mrp="/sf/mw/netprotocols/applayerpluginsandutils/uripermissionservices/group/application-protocols_ineturilist.mrp"/>
-</component>
-<component name="bookmarksupport" long-name="Bookmark Support" introduced="9.1" purpose="optional">
-<unit bldFile="/sf/mw/netprotocols/applayerpluginsandutils/bookmarksupport/group" mrp="/sf/mw/netprotocols/applayerpluginsandutils/bookmarksupport/group/application-protocols_bookmarks.mrp"/>
-</component>
-<component name="httpprotocolplugins" long-name="HTTP Protocol Plugins" introduced="6.2" purpose="optional" plugin="Y">
-<unit bldFile="/sf/mw/netprotocols/applayerpluginsandutils/httpprotocolplugins/group" mrp="/sf/mw/netprotocols/applayerpluginsandutils/httpprotocolplugins/group/http_protocol-plugin.mrp"/>
-</component>
-<component name="httptransportplugins" long-name="HTTP Transport Plugins" introduced="6.2" purpose="optional" plugin="Y">
-<unit bldFile="/sf/mw/netprotocols/applayerpluginsandutils/httptransportplugins/group" mrp="/sf/mw/netprotocols/applayerpluginsandutils/httptransportplugins/group/http_transport-plugin.mrp"/>
-</component>
-</collection>
-<collection name="netprotocols_info" long-name="High-level Internet Protocols Info" level="specific">
-<component name="netprotocols_metadata" long-name="High-level Internet Protocols Metadata" introduced="tb91" purpose="development" class="config PC">
-<unit mrp="/sf/mw/netprotocols/netprotocols_info/netprotocols_metadata/netprotocols_metadata.mrp"/>
-</component>
-</collection>
-<collection name="s60">
-<component name="netprotocols">
-<unit bldFile="/sf/mw/netprotocols/group" mrp=""/>
-</component>
-</collection>
-</block>
-</layer>
-</systemModel>
-</SystemDefinition>
\ No newline at end of file
+<!DOCTYPE SystemDefinition [
+<!ELEMENT SystemDefinition ( systemModel )>
+<!ATTLIST SystemDefinition
+ name CDATA #REQUIRED
+ schema CDATA #REQUIRED
+>
+<!-- all paths are relative to the environment variable specified by the root attribute, or SOURCEROOT if not. -->
+
+<!-- System Model Section of DTD -->
+<!ELEMENT systemModel (layer+)>
+
+<!ELEMENT layer (block* | collection*)*>
+<!-- Kernel Services, Base Services, OS Services, Etc -->
+<!ATTLIST layer
+ name CDATA #REQUIRED
+ long-name CDATA #IMPLIED
+ levels NMTOKENS #IMPLIED
+ span CDATA #IMPLIED
+>
+
+<!ELEMENT block (subblock* | collection*)*>
+ <!-- Generic OS services, Comms Services, etc -->
+<!ATTLIST block
+ levels NMTOKENS #IMPLIED
+ span CDATA #IMPLIED
+ level NMTOKEN #IMPLIED
+ name CDATA #REQUIRED
+ long-name CDATA #IMPLIED
+>
+
+<!ELEMENT subblock (collection)*>
+<!-- Cellular Baseband Services, Networking Services, etc -->
+<!ATTLIST subblock
+ name CDATA #REQUIRED
+ long-name CDATA #IMPLIED
+>
+
+<!ELEMENT collection (component)*>
+<!-- Screen Driver, Content Handling, etc -->
+<!ATTLIST collection
+ name CDATA #REQUIRED
+ long-name CDATA #IMPLIED
+ level NMTOKEN #IMPLIED
+>
+
+<!ELEMENT component (unit)*>
+<!-- contains units or is a package or prebuilt -->
+<!ATTLIST component
+ name CDATA #REQUIRED
+ long-name CDATA #IMPLIED
+ deprecated CDATA #IMPLIED
+ introduced CDATA #IMPLIED
+ contract CDATA #IMPLIED
+ plugin (Y|N) "N"
+ filter CDATA #IMPLIED
+ class NMTOKENS #IMPLIED
+ supports CDATA #IMPLIED
+ purpose ( optional | mandatory | development ) "optional"
+>
+
+<!ELEMENT unit EMPTY >
+<!-- must be buildable (bld.inf) -->
+<!-- bldFile may someday be removed in favour of mrp -->
+<!ATTLIST unit
+ mrp CDATA #IMPLIED
+ filter CDATA #IMPLIED
+ bldFile CDATA #IMPLIED
+ root CDATA #IMPLIED
+ version NMTOKEN #IMPLIED
+ prebuilt NMTOKEN #IMPLIED
+ late (Y|N) #IMPLIED
+ priority CDATA #IMPLIED
+>
+]>
+<SystemDefinition name="Symbian^3" schema="2.0.1">
+ <systemModel>
+ <layer name="mw" long-name="Middleware" levels="generic specific">
+ <block name="netprotocols" level="generic" long-name="High-level Internet Protocols" levels="plugin framework server generic specific">
+ <collection name="httpfilters" long-name="HTTP Filters" level="plugin">
+ <component name="httpfiltercommon" filter="s60" long-name="HTTP Filter Common">
+ <unit bldFile="/sf/mw/netprotocols/httpfilters/httpfiltercommon/group"/>
+ </component>
+ <component name="cookie" filter="s60" long-name="Cookie Filter" plugin="Y">
+ <unit bldFile="/sf/mw/netprotocols/httpfilters/cookie/group"/>
+ </component>
+ <component name="deflatefilter" filter="s60" long-name="Deflate Filter" plugin="Y">
+ <unit bldFile="/sf/mw/netprotocols/httpfilters/deflatefilter/group"/>
+ </component>
+ <component name="httpfilteracceptheader" filter="s60" long-name="Accept Header Filter" plugin="Y">
+ <unit bldFile="/sf/mw/netprotocols/httpfilters/httpfilteracceptheader/group"/>
+ </component>
+ <component name="httpfilterauthentication" filter="s60" long-name="Authentication Filter" plugin="Y">
+ <unit bldFile="/sf/mw/netprotocols/httpfilters/httpfilterauthentication/group"/>
+ </component>
+ <component name="httpfilterconnhandler" filter="s60" long-name="Connection Handler Fitler" plugin="Y">
+ <unit bldFile="/sf/mw/netprotocols/httpfilters/httpfilterconnhandler/group"/>
+ </component>
+ <component name="httpfilteriop" filter="s60" long-name="HTTP IOP Filter" plugin="Y">
+ <unit bldFile="/sf/mw/netprotocols/httpfilters/httpfilteriop/group"/>
+ </component>
+ <component name="httpfilterproxy" filter="s60" long-name="HTTP Proxy Filter" plugin="Y">
+ <unit bldFile="/sf/mw/netprotocols/httpfilters/httpfilterproxy/group"/>
+ </component>
+ <component name="uaproffilter" filter="s60" long-name="UAProf Filter" plugin="Y">
+ <unit bldFile="/sf/mw/netprotocols/httpfilters/uaproffilter/group"/>
+ </component>
+ </collection>
+ <collection name="applayerprotocols" long-name="Application Layer Protocols" level="server">
+ <component name="httptransportfw" long-name="HTTP Transport Framework" introduced="6.2" purpose="optional">
+ <unit bldFile="/sf/mw/netprotocols/applayerprotocols/httptransportfw/group" mrp="/sf/mw/netprotocols/applayerprotocols/httptransportfw/group/http_transport-framework.mrp"/>
+ </component>
+ <component name="httpexamples" long-name="HTTP Examples" introduced="6.2" purpose="development">
+ <unit bldFile="/sf/mw/netprotocols/applayerprotocols/httpexamples/group" mrp="/sf/mw/netprotocols/applayerprotocols/httpexamples/group/http_examples.mrp"/>
+ </component>
+ <component name="wappushsupport" long-name="WAP Push Support" introduced="6.2" purpose="optional">
+ <unit bldFile="/sf/mw/netprotocols/applayerprotocols/wappushsupport/Group" mrp="/sf/mw/netprotocols/applayerprotocols/wappushsupport/Group/wap-browser_wappushsupport.mrp"/>
+ </component>
+ <component name="wapbase" long-name="WAP Base" introduced="6.0" purpose="optional">
+ <unit bldFile="/sf/mw/netprotocols/applayerprotocols/wapbase/Group" mrp="/sf/mw/netprotocols/applayerprotocols/wapbase/Group/wap-browser_wapbase.mrp"/>
+ </component>
+ <component name="ftpengine" long-name="FTP Engine" introduced="6.0" purpose="optional">
+ <unit bldFile="/sf/mw/netprotocols/applayerprotocols/ftpengine/group" mrp="/sf/mw/netprotocols/applayerprotocols/ftpengine/group/networking_ftp_e.mrp"/>
+ </component>
+ <component name="telnetengine" long-name="Telnet Engine" introduced="6.0" purpose="optional">
+ <unit bldFile="/sf/mw/netprotocols/applayerprotocols/telnetengine/group" mrp="/sf/mw/netprotocols/applayerprotocols/telnetengine/group/networking_telnet_e.mrp"/>
+ </component>
+ <component name="httpserviceapi" long-name="HTTP Service API" introduced="TB9.2" purpose="optional">
+ <unit bldFile="/sf/mw/netprotocols/applayerprotocols/httpservice/group" mrp="/sf/mw/netprotocols/applayerprotocols/httpservice/group/http_service.mrp"/>
+ </component>
+ </collection>
+ <collection name="applayerpluginsandutils" long-name="Application Layer Plugins and Utils" level="framework">
+ <component name="uripermissionservices" long-name="URI Permission Services" introduced="^2" purpose="optional">
+ <unit bldFile="/sf/mw/netprotocols/applayerpluginsandutils/uripermissionservices/group" mrp="/sf/mw/netprotocols/applayerpluginsandutils/uripermissionservices/group/application-protocols_ineturilist.mrp"/>
+ </component>
+ <component name="bookmarksupport" long-name="Bookmark Support" introduced="9.1" purpose="optional">
+ <unit bldFile="/sf/mw/netprotocols/applayerpluginsandutils/bookmarksupport/group" mrp="/sf/mw/netprotocols/applayerpluginsandutils/bookmarksupport/group/application-protocols_bookmarks.mrp"/>
+ </component>
+ <component name="httpprotocolplugins" long-name="HTTP Protocol Plugins" introduced="6.2" purpose="optional" plugin="Y">
+ <unit bldFile="/sf/mw/netprotocols/applayerpluginsandutils/httpprotocolplugins/group" mrp="/sf/mw/netprotocols/applayerpluginsandutils/httpprotocolplugins/group/http_protocol-plugin.mrp"/>
+ </component>
+ <component name="httptransportplugins" long-name="HTTP Transport Plugins" introduced="6.2" purpose="optional" plugin="Y">
+ <unit bldFile="/sf/mw/netprotocols/applayerpluginsandutils/httptransportplugins/group" mrp="/sf/mw/netprotocols/applayerpluginsandutils/httptransportplugins/group/http_transport-plugin.mrp"/>
+ </component>
+ </collection>
+ <collection name="netprotocols_info" long-name="High-level Internet Protocols Info" level="specific">
+ <component name="netprotocols_plat" filter="s60" long-name="High-level Internet Protocols Platform Interfaces" class="api">
+ <unit bldFile="/sf/mw/netprotocols/netprotocols_plat/group"/>
+ </component>
+ <component name="netprotocols_metadata" long-name="High-level Internet Protocols Metadata" introduced="^2" purpose="development" class="config PC">
+ <unit mrp="/sf/mw/netprotocols/netprotocols_info/netprotocols_metadata/netprotocols_metadata.mrp"/>
+ </component>
+ </collection>
+ </block>
+ </layer>
+ </systemModel>
+</SystemDefinition>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/symbian3/mw/netprotocols/package_definition_3.0.xml Mon Feb 15 18:25:55 2010 +0000
@@ -0,0 +1,79 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<SystemDefinition schema="3.0.0">
+ <package id="netprotocols" name="High-level Internet Protocols" levels="plugin framework server generic specific">
+ <collection id="httpfilters" name="HTTP Filters" level="plugin">
+ <component id="httpfiltercommon" filter="s60" name="HTTP Filter Common">
+ <unit bldFile="httpfilters/httpfiltercommon/group"/>
+ </component>
+ <component id="cookie" filter="s60" name="Cookie Filter" class="plugin">
+ <unit bldFile="httpfilters/cookie/group"/>
+ </component>
+ <component id="deflatefilter" filter="s60" name="Deflate Filter" class="plugin">
+ <unit bldFile="httpfilters/deflatefilter/group"/>
+ </component>
+ <component id="httpfilteracceptheader" filter="s60" name="Accept Header Filter" class="plugin">
+ <unit bldFile="httpfilters/httpfilteracceptheader/group"/>
+ </component>
+ <component id="httpfilterauthentication" filter="s60" name="Authentication Filter" class="plugin">
+ <unit bldFile="httpfilters/httpfilterauthentication/group"/>
+ </component>
+ <component id="httpfilterconnhandler" filter="s60" name="Connection Handler Fitler" class="plugin">
+ <unit bldFile="httpfilters/httpfilterconnhandler/group"/>
+ </component>
+ <component id="httpfilteriop" filter="s60" name="HTTP IOP Filter" class="plugin">
+ <unit bldFile="httpfilters/httpfilteriop/group"/>
+ </component>
+ <component id="httpfilterproxy" filter="s60" name="HTTP Proxy Filter" class="plugin">
+ <unit bldFile="httpfilters/httpfilterproxy/group"/>
+ </component>
+ <component id="uaproffilter" filter="s60" name="UAProf Filter" class="plugin">
+ <unit bldFile="httpfilters/uaproffilter/group"/>
+ </component>
+ </collection>
+ <collection id="applayerprotocols" name="Application Layer Protocols" level="server">
+ <component id="httptransportfw" name="HTTP Transport Framework" introduced="6.2" purpose="optional">
+ <unit bldFile="applayerprotocols/httptransportfw/group" mrp="applayerprotocols/httptransportfw/group/http_transport-framework.mrp"/>
+ </component>
+ <component id="httpexamples" name="HTTP Examples" introduced="6.2" purpose="development">
+ <unit bldFile="applayerprotocols/httpexamples/group" mrp="applayerprotocols/httpexamples/group/http_examples.mrp"/>
+ </component>
+ <component id="wappushsupport" name="WAP Push Support" introduced="6.2" purpose="optional">
+ <unit bldFile="applayerprotocols/wappushsupport/Group" mrp="applayerprotocols/wappushsupport/Group/wap-browser_wappushsupport.mrp"/>
+ </component>
+ <component id="wapbase" name="WAP Base" introduced="6.0" purpose="optional">
+ <unit bldFile="applayerprotocols/wapbase/Group" mrp="applayerprotocols/wapbase/Group/wap-browser_wapbase.mrp"/>
+ </component>
+ <component id="ftpengine" name="FTP Engine" introduced="6.0" purpose="optional">
+ <unit bldFile="applayerprotocols/ftpengine/group" mrp="applayerprotocols/ftpengine/group/networking_ftp_e.mrp"/>
+ </component>
+ <component id="telnetengine" name="Telnet Engine" introduced="6.0" purpose="optional">
+ <unit bldFile="applayerprotocols/telnetengine/group" mrp="applayerprotocols/telnetengine/group/networking_telnet_e.mrp"/>
+ </component>
+ <component id="httpserviceapi" name="HTTP Service API" introduced="TB9.2" purpose="optional">
+ <unit bldFile="applayerprotocols/httpservice/group" mrp="applayerprotocols/httpservice/group/http_service.mrp"/>
+ </component>
+ </collection>
+ <collection id="applayerpluginsandutils" name="Application Layer Plugins and Utils" level="framework">
+ <component id="uripermissionservices" name="URI Permission Services" introduced="^2" purpose="optional">
+ <unit bldFile="applayerpluginsandutils/uripermissionservices/group" mrp="applayerpluginsandutils/uripermissionservices/group/application-protocols_ineturilist.mrp"/>
+ </component>
+ <component id="bookmarksupport" name="Bookmark Support" introduced="9.1" purpose="optional">
+ <unit bldFile="applayerpluginsandutils/bookmarksupport/group" mrp="applayerpluginsandutils/bookmarksupport/group/application-protocols_bookmarks.mrp"/>
+ </component>
+ <component id="httpprotocolplugins" name="HTTP Protocol Plugins" introduced="6.2" purpose="optional" class="plugin">
+ <unit bldFile="applayerpluginsandutils/httpprotocolplugins/group" mrp="applayerpluginsandutils/httpprotocolplugins/group/http_protocol-plugin.mrp"/>
+ </component>
+ <component id="httptransportplugins" name="HTTP Transport Plugins" introduced="6.2" purpose="optional" class="plugin">
+ <unit bldFile="applayerpluginsandutils/httptransportplugins/group" mrp="applayerpluginsandutils/httptransportplugins/group/http_transport-plugin.mrp"/>
+ </component>
+ </collection>
+ <collection id="netprotocols_info" name="High-level Internet Protocols Info" level="specific">
+ <component id="netprotocols_plat" filter="s60" name="High-level Internet Protocols Platform Interfaces" class="api">
+ <unit bldFile="netprotocols_plat/group"/>
+ </component>
+ <component id="netprotocols_metadata" name="High-level Internet Protocols Metadata" class="config" introduced="^2" purpose="development" target="desktop">
+ <unit mrp="netprotocols_info/netprotocols_metadata/netprotocols_metadata.mrp"/>
+ </component>
+ </collection>
+ </package>
+</SystemDefinition>
--- a/symbian3/mw/opensrv/package_definition.xml Fri Feb 12 16:37:22 2010 +0000
+++ b/symbian3/mw/opensrv/package_definition.xml Mon Feb 15 18:25:55 2010 +0000
@@ -1,109 +1,118 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE SystemDefinition [
- <!ELEMENT SystemDefinition (systemModel?,SystemBuild?)>
- <!ATTLIST SystemDefinition
- name CDATA #REQUIRED
- schema CDATA #REQUIRED>
- <!ELEMENT systemModel (layer+)>
- <!ELEMENT layer (block*|collection*)*>
- <!ATTLIST layer
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED
- levels NMTOKENS #IMPLIED
- span CDATA #IMPLIED>
- <!ELEMENT block (subblock*|collection*)*>
- <!ATTLIST block
- levels NMTOKENS #IMPLIED
- span CDATA #IMPLIED
- level NMTOKEN #IMPLIED
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED>
- <!ELEMENT subblock (collection)*>
- <!ATTLIST subblock
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED>
- <!ELEMENT collection (component)*>
- <!ATTLIST collection
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED
- level NMTOKEN #IMPLIED>
- <!ELEMENT component (unit)*>
- <!ATTLIST component
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED
- deprecated CDATA #IMPLIED
- introduced CDATA #IMPLIED
- contract CDATA #IMPLIED
- plugin (Y|N) 'N'
- filter CDATA #IMPLIED
- class NMTOKENS #IMPLIED
- supports CDATA #IMPLIED
- purpose (optional|mandatory|development) 'optional'>
- <!ELEMENT unit EMPTY>
- <!ATTLIST unit
- mrp CDATA #IMPLIED
- filter CDATA #IMPLIED
- bldFile CDATA #IMPLIED
- root CDATA #IMPLIED
- version NMTOKEN #IMPLIED
- prebuilt NMTOKEN #IMPLIED
- late (Y|N) #IMPLIED
- priority CDATA #IMPLIED>
- <!ELEMENT SystemBuild (option*|target+|targetList+|list+|configuration+)*>
- <!ATTLIST SystemBuild schema CDATA #REQUIRED>
- <!ELEMENT list (ref+)>
- <!ATTLIST list
- name ID #REQUIRED
- description CDATA #REQUIRED>
- <!ELEMENT ref EMPTY>
- <!ATTLIST ref item CDATA #REQUIRED>
- <!ELEMENT targetList EMPTY>
- <!ATTLIST targetList
- name ID #REQUIRED
- description CDATA #REQUIRED
- target IDREFS #REQUIRED>
- <!ELEMENT target EMPTY>
- <!ATTLIST target
- name ID #REQUIRED
- abldTarget CDATA #REQUIRED
- description CDATA #REQUIRED>
- <!ELEMENT option EMPTY>
- <!ATTLIST option
- name ID #REQUIRED
- abldOption CDATA #REQUIRED
- description CDATA #REQUIRED
- enable (Y|N) #REQUIRED>
- <!ELEMENT configuration (listRef+|ref+|task+)*>
- <!ATTLIST configuration
- name ID #REQUIRED
- description CDATA #REQUIRED
- filter CDATA #REQUIRED>
- <!ELEMENT task (listRef*,(buildLayer|specialInstructions))>
- <!ELEMENT listRef EMPTY>
- <!ATTLIST listRef list CDATA #REQUIRED>
- <!ELEMENT buildLayer EMPTY>
- <!ATTLIST buildLayer
- command CDATA #REQUIRED
- targetList IDREFS #IMPLIED
- unitParallel (Y|N) #REQUIRED
- targetParallel (Y|N) 'N'>
- <!ELEMENT specialInstructions EMPTY>
- <!ATTLIST specialInstructions
- name CDATA #REQUIRED
- cwd CDATA #REQUIRED
- root CDATA #IMPLIED
- command CDATA #REQUIRED>
-]>
-<SystemDefinition schema="2.0.1" name="Symbian^3">
-<systemModel>
-<layer name="mw">
-<block name="opensrv">
-<collection name="s60">
-<component name="opensrv">
-<unit bldFile="/sf/mw/opensrv/group" mrp=""/>
-</component>
-</collection>
-</block>
-</layer>
-</systemModel>
+<!DOCTYPE SystemDefinition [
+<!ELEMENT SystemDefinition ( systemModel )>
+<!ATTLIST SystemDefinition
+ name CDATA #REQUIRED
+ schema CDATA #REQUIRED
+>
+<!-- all paths are relative to the environment variable specified by the root attribute, or SOURCEROOT if not. -->
+
+<!-- System Model Section of DTD -->
+<!ELEMENT systemModel (layer+)>
+
+<!ELEMENT layer (block* | collection*)*>
+<!-- Kernel Services, Base Services, OS Services, Etc -->
+<!ATTLIST layer
+ name CDATA #REQUIRED
+ long-name CDATA #IMPLIED
+ levels NMTOKENS #IMPLIED
+ span CDATA #IMPLIED
+>
+
+<!ELEMENT block (subblock* | collection*)*>
+ <!-- Generic OS services, Comms Services, etc -->
+<!ATTLIST block
+ levels NMTOKENS #IMPLIED
+ span CDATA #IMPLIED
+ level NMTOKEN #IMPLIED
+ name CDATA #REQUIRED
+ long-name CDATA #IMPLIED
+>
+
+<!ELEMENT subblock (collection)*>
+<!-- Cellular Baseband Services, Networking Services, etc -->
+<!ATTLIST subblock
+ name CDATA #REQUIRED
+ long-name CDATA #IMPLIED
+>
+
+<!ELEMENT collection (component)*>
+<!-- Screen Driver, Content Handling, etc -->
+<!ATTLIST collection
+ name CDATA #REQUIRED
+ long-name CDATA #IMPLIED
+ level NMTOKEN #IMPLIED
+>
+
+<!ELEMENT component (unit)*>
+<!-- contains units or is a package or prebuilt -->
+<!ATTLIST component
+ name CDATA #REQUIRED
+ long-name CDATA #IMPLIED
+ deprecated CDATA #IMPLIED
+ introduced CDATA #IMPLIED
+ contract CDATA #IMPLIED
+ plugin (Y|N) "N"
+ filter CDATA #IMPLIED
+ class NMTOKENS #IMPLIED
+ supports CDATA #IMPLIED
+ purpose ( optional | mandatory | development ) "optional"
+>
+
+<!ELEMENT unit EMPTY >
+<!-- must be buildable (bld.inf) -->
+<!-- bldFile may someday be removed in favour of mrp -->
+<!ATTLIST unit
+ mrp CDATA #IMPLIED
+ filter CDATA #IMPLIED
+ bldFile CDATA #IMPLIED
+ root CDATA #IMPLIED
+ version NMTOKEN #IMPLIED
+ prebuilt NMTOKEN #IMPLIED
+ late (Y|N) #IMPLIED
+ priority CDATA #IMPLIED
+>
+]>
+<SystemDefinition name="Symbian^3" schema="2.0.1">
+ <systemModel>
+ <layer name="mw" long-name="Middleware" levels="generic specific">
+ <block name="opensrv" level="specific" long-name="Open Services" levels="prt lib server eng">
+ <collection name="loudmouth" long-name="Loudmouth" level="prt">
+ <!-- collection is really a component so it needs to be moved down a directory -->
+ <component name="loudmouth_build" filter="s60" long-name="Loudmouth Build" introduced="^2">
+ <unit bldFile="/sf/mw/opensrv/loudmouth/group"/>
+ </component>
+ </collection>
+ <collection name="libtelepathy" long-name="Telepathy Library" level="lib">
+ <!-- collection is really a component so it needs to be moved down a directory -->
+ <component name="libtelepathy_build" filter="s60" long-name="Telepathy Library Build" introduced="^2">
+ <unit bldFile="/sf/mw/opensrv/libtelepathy/group"/>
+ </component>
+ </collection>
+ <collection name="telepathygabble" long-name="Telepathy Gabble" level="eng">
+ <!-- collection is really a component so it needs to be moved down a directory -->
+ <component name="telepathygabble_build" filter="s60" long-name="Telepathy Gabble Build" introduced="^2">
+ <unit bldFile="/sf/mw/opensrv/telepathygabble/group"/>
+ </component>
+ </collection>
+ <collection name="isolationserver" long-name="Isolation Server" level="server">
+ <component name="messagequeue" filter="s60" long-name="Message Queue" introduced="^2">
+ <unit bldFile="/sf/mw/opensrv/isolationserver/messagequeue/group"/>
+ </component>
+ <component name="isoserver" filter="s60" long-name="ISO Server" introduced="^2">
+ <unit bldFile="/sf/mw/opensrv/isolationserver/isoserver/group"/>
+ </component>
+ <component name="isolationserver_build" filter="s60" long-name="Isloation Server Build" introduced="^2">
+ <!-- needs #includes removed. either move the exports to another component or make this a ROM component -->
+ <unit bldFile="/sf/mw/opensrv/isolationserver/group"/>
+ </component>
+ </collection>
+ <collection name="opensrv_info" long-name="Open Services Info" level="eng">
+ <component name="opensrv_plat" filter="s60" long-name="Open Services Platform Interfaces" introduced="^2" class="api">
+ <unit bldFile="/sf/mw/opensrv/opensrv_plat/group"/>
+ </component>
+ </collection>
+ </block>
+ </layer>
+ </systemModel>
</SystemDefinition>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/symbian3/mw/opensrv/package_definition_3.0.xml Mon Feb 15 18:25:55 2010 +0000
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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>
+ </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>
+ </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>
+ </collection>
+ <collection id="isolationserver" name="Isolation Server" level="server">
+ <component id="messagequeue" filter="s60" name="Message Queue" introduced="^2">
+ <unit bldFile="isolationserver/messagequeue/group"/>
+ </component>
+ <component id="isoserver" filter="s60" name="ISO Server" introduced="^2">
+ <unit bldFile="isolationserver/isoserver/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"/>
+ </component>
+ </collection>
+ </package>
+</SystemDefinition>
--- a/symbian3/mw/phonesrv/package_definition.xml Fri Feb 12 16:37:22 2010 +0000
+++ b/symbian3/mw/phonesrv/package_definition.xml Mon Feb 15 18:25:55 2010 +0000
@@ -1,175 +1,216 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE SystemDefinition [
- <!ELEMENT SystemDefinition (systemModel?,SystemBuild?)>
- <!ATTLIST SystemDefinition
- name CDATA #REQUIRED
- schema CDATA #REQUIRED>
- <!ELEMENT systemModel (layer+)>
- <!ELEMENT layer (block*|collection*)*>
- <!ATTLIST layer
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED
- levels NMTOKENS #IMPLIED
- span CDATA #IMPLIED>
- <!ELEMENT block (subblock*|collection*)*>
- <!ATTLIST block
- levels NMTOKENS #IMPLIED
- span CDATA #IMPLIED
- level NMTOKEN #IMPLIED
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED>
- <!ELEMENT subblock (collection)*>
- <!ATTLIST subblock
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED>
- <!ELEMENT collection (component)*>
- <!ATTLIST collection
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED
- level NMTOKEN #IMPLIED>
- <!ELEMENT component (unit)*>
- <!ATTLIST component
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED
- deprecated CDATA #IMPLIED
- introduced CDATA #IMPLIED
- contract CDATA #IMPLIED
- plugin (Y|N) 'N'
- filter CDATA #IMPLIED
- class NMTOKENS #IMPLIED
- supports CDATA #IMPLIED
- purpose (optional|mandatory|development) 'optional'>
- <!ELEMENT unit EMPTY>
- <!ATTLIST unit
- mrp CDATA #IMPLIED
- filter CDATA #IMPLIED
- bldFile CDATA #IMPLIED
- root CDATA #IMPLIED
- version NMTOKEN #IMPLIED
- prebuilt NMTOKEN #IMPLIED
- late (Y|N) #IMPLIED
- priority CDATA #IMPLIED>
- <!ELEMENT SystemBuild (option*|target+|targetList+|list+|configuration+)*>
- <!ATTLIST SystemBuild schema CDATA #REQUIRED>
- <!ELEMENT list (ref+)>
- <!ATTLIST list
- name ID #REQUIRED
- description CDATA #REQUIRED>
- <!ELEMENT ref EMPTY>
- <!ATTLIST ref item CDATA #REQUIRED>
- <!ELEMENT targetList EMPTY>
- <!ATTLIST targetList
- name ID #REQUIRED
- description CDATA #REQUIRED
- target IDREFS #REQUIRED>
- <!ELEMENT target EMPTY>
- <!ATTLIST target
- name ID #REQUIRED
- abldTarget CDATA #REQUIRED
- description CDATA #REQUIRED>
- <!ELEMENT option EMPTY>
- <!ATTLIST option
- name ID #REQUIRED
- abldOption CDATA #REQUIRED
- description CDATA #REQUIRED
- enable (Y|N) #REQUIRED>
- <!ELEMENT configuration (listRef+|ref+|task+)*>
- <!ATTLIST configuration
- name ID #REQUIRED
- description CDATA #REQUIRED
- filter CDATA #REQUIRED>
- <!ELEMENT task (listRef*,(buildLayer|specialInstructions))>
- <!ELEMENT listRef EMPTY>
- <!ATTLIST listRef list CDATA #REQUIRED>
- <!ELEMENT buildLayer EMPTY>
- <!ATTLIST buildLayer
- command CDATA #REQUIRED
- targetList IDREFS #IMPLIED
- unitParallel (Y|N) #REQUIRED
- targetParallel (Y|N) 'N'>
- <!ELEMENT specialInstructions EMPTY>
- <!ATTLIST specialInstructions
- name CDATA #REQUIRED
- cwd CDATA #REQUIRED
- root CDATA #IMPLIED
- command CDATA #REQUIRED>
-]>
-<SystemDefinition schema="2.0.1" name="Symbian^3">
-<systemModel>
-<layer name="mw">
-<block name="phonesrv">
-<collection name="s60">
-<component name="phonesrv_plat">
-<unit bldFile="/sf/mw/phonesrv/phonesrv_plat/group" mrp=""/>
-</component>
-<component name="phonesrv_pub">
-<unit bldFile="/sf/mw/phonesrv/phonesrv_pub/group" mrp=""/>
-</component>
-<component name="CbsServer">
-<unit bldFile="/sf/mw/phonesrv/cbs/CbsServer/group" mrp=""/>
-</component>
-<component name="cbsui">
-<unit bldFile="/sf/mw/phonesrv/cbs/cbsui/group" mrp=""/>
-</component>
-<component name="convergedcallengine">
-<unit bldFile="/sf/mw/phonesrv/convergedcallengine/group" mrp=""/>
-</component>
-<component name="networkhandlingengine">
-<unit bldFile="/sf/mw/phonesrv/networkhandling/networkhandlingengine/group" mrp=""/>
-</component>
-<component name="aiwdialdata">
-<unit bldFile="/sf/mw/phonesrv/phoneclientserver/aiwdialdata/group" mrp=""/>
-</component>
-<component name="CallUI">
-<unit bldFile="/sf/mw/phonesrv/phoneclientserver/CallUI/group" mrp=""/>
-</component>
-<component name="dialutils">
-<unit bldFile="/sf/mw/phonesrv/phoneclientserver/dialutils/group" mrp=""/>
-</component>
-<component name="EnPolicy">
-<unit bldFile="/sf/mw/phonesrv/phoneclientserver/EnPolicy/group" mrp=""/>
-</component>
-<component name="phoneclient">
-<unit bldFile="/sf/mw/phonesrv/phoneclientserver/phoneclient/group" mrp=""/>
-</component>
-<component name="phoneserver">
-<unit bldFile="/sf/mw/phonesrv/phoneclientserver/phoneserver/group" mrp=""/>
-</component>
-<component name="SatServer">
-<unit bldFile="/sf/mw/phonesrv/satengine/SatServer/group" mrp=""/>
-</component>
-<component name="satapp">
-<unit bldFile="/sf/mw/phonesrv/satui/satapp/group" mrp=""/>
-</component>
-<component name="satplugin">
-<unit bldFile="/sf/mw/phonesrv/satui/satplugin/group" mrp=""/>
-</component>
-<component name="phoneparser">
-<unit bldFile="/sf/mw/phonesrv/telutils/phoneparser/group" mrp=""/>
-</component>
-<component name="telephonyservice">
-<unit bldFile="/sf/mw/phonesrv/telutils/telephonyservice/group" mrp=""/>
-</component>
-<component name="telephonysettings">
-<unit bldFile="/sf/mw/phonesrv/cellular/telephonysettings/group" mrp=""/>
-</component>
-<component name="sssettings">
-<unit bldFile="/sf/mw/phonesrv/cellular/sssettings/group" mrp=""/>
-</component>
-<component name="psetnotesui">
-<unit bldFile="/sf/mw/phonesrv/cellular/psetnotesui/group" mrp=""/>
-</component>
-<component name="servicerequest">
-<unit bldFile="/sf/mw/phonesrv/cellular/servicerequest/group" mrp=""/>
-</component>
-<component name="phonecmdhnlr">
-<unit bldFile="/sf/mw/phonesrv/phonecmdhandler/phonecmdhnlr/group" mrp=""/>
-</component>
-<component name="vmbxengine">
-<unit bldFile="/sf/mw/phonesrv/engines/vmbxengine/group" mrp=""/>
-</component>
-</collection>
-</block>
-</layer>
-</systemModel>
+<!DOCTYPE SystemDefinition [
+<!ELEMENT SystemDefinition ( systemModel )>
+<!ATTLIST SystemDefinition
+ name CDATA #REQUIRED
+ schema CDATA #REQUIRED
+>
+<!-- all paths are relative to the environment variable specified by the root attribute, or SOURCEROOT if not. -->
+
+<!-- System Model Section of DTD -->
+<!ELEMENT systemModel (layer+)>
+
+<!ELEMENT layer (block* | collection*)*>
+<!-- Kernel Services, Base Services, OS Services, Etc -->
+<!ATTLIST layer
+ name CDATA #REQUIRED
+ long-name CDATA #IMPLIED
+ levels NMTOKENS #IMPLIED
+ span CDATA #IMPLIED
+>
+
+<!ELEMENT block (subblock* | collection*)*>
+ <!-- Generic OS services, Comms Services, etc -->
+<!ATTLIST block
+ levels NMTOKENS #IMPLIED
+ span CDATA #IMPLIED
+ level NMTOKEN #IMPLIED
+ name CDATA #REQUIRED
+ long-name CDATA #IMPLIED
+>
+
+<!ELEMENT subblock (collection)*>
+<!-- Cellular Baseband Services, Networking Services, etc -->
+<!ATTLIST subblock
+ name CDATA #REQUIRED
+ long-name CDATA #IMPLIED
+>
+
+<!ELEMENT collection (component)*>
+<!-- Screen Driver, Content Handling, etc -->
+<!ATTLIST collection
+ name CDATA #REQUIRED
+ long-name CDATA #IMPLIED
+ level NMTOKEN #IMPLIED
+>
+
+<!ELEMENT component (unit)*>
+<!-- contains units or is a package or prebuilt -->
+<!ATTLIST component
+ name CDATA #REQUIRED
+ long-name CDATA #IMPLIED
+ deprecated CDATA #IMPLIED
+ introduced CDATA #IMPLIED
+ contract CDATA #IMPLIED
+ plugin (Y|N) "N"
+ filter CDATA #IMPLIED
+ class NMTOKENS #IMPLIED
+ supports CDATA #IMPLIED
+ purpose ( optional | mandatory | development ) "optional"
+>
+
+<!ELEMENT unit EMPTY >
+<!-- must be buildable (bld.inf) -->
+<!-- bldFile may someday be removed in favour of mrp -->
+<!ATTLIST unit
+ mrp CDATA #IMPLIED
+ filter CDATA #IMPLIED
+ bldFile CDATA #IMPLIED
+ root CDATA #IMPLIED
+ version NMTOKEN #IMPLIED
+ prebuilt NMTOKEN #IMPLIED
+ late (Y|N) #IMPLIED
+ priority CDATA #IMPLIED
+>
+]>
+<SystemDefinition name="Symbian^3" schema="2.0.1">
+ <systemModel>
+ <layer name="mw" long-name="Middleware" levels="generic specific">
+ <block name="phonesrv" level="specific" long-name="Telephony and SIM Services" levels="plugin framework server generic specific">
+ <collection name="telutils" long-name="Telephony Utils" level="generic">
+ <component name="phoneparser" filter="s60" long-name="Phone Parser">
+ <unit bldFile="/sf/mw/phonesrv/telutils/phoneparser/group"/>
+ </component>
+ <component name="telephonyservice" filter="s60" long-name="Telephony Service">
+ <unit bldFile="/sf/mw/phonesrv/telutils/telephonyservice/group"/>
+ </component>
+ </collection>
+ <collection name="cbs" long-name="Cellular Baseband Services" level="plugin">
+ <component name="cbsserver" filter="s60" long-name="CBS Server">
+ <unit bldFile="/sf/mw/phonesrv/cbs/cbsserver/group"/>
+ </component>
+ <component name="cbsui" filter="s60" long-name="CBS UI">
+ <unit bldFile="/sf/mw/phonesrv/cbs/cbsui/group"/>
+ </component>
+ </collection>
+ <collection name="cellular" long-name="Cellular" level="server">
+ <component name="telephonysettings" filter="s60" long-name="Telephony Settings">
+ <unit bldFile="/sf/mw/phonesrv/cellular/telephonysettings/group"/>
+ </component>
+ <component name="sssettings" filter="s60" long-name="Supplementary Service Settings">
+ <unit bldFile="/sf/mw/phonesrv/cellular/sssettings/group"/>
+ </component>
+ <component name="psetnotesui" filter="s60" long-name="Phone Settings Notes UI">
+ <unit bldFile="/sf/mw/phonesrv/cellular/psetnotesui/group"/>
+ </component>
+ <component name="servicerequest" filter="s60" long-name="Service Request">
+ <unit bldFile="/sf/mw/phonesrv/cellular/servicerequest/group"/>
+ </component>
+ <component name="cellular_test" filter="s60,api_test" long-name="Cellular Tests" purpose="development">
+ <!-- can only have one unit. Need to #include from a single bld.inf (cellular/tsrc/bld.inf?) -->
+ <unit bldFile="/sf/mw/phonesrv/cellular/PsetNotesUi/tsrc/public/basic/group"/>
+ <unit bldFile="/sf/mw/phonesrv/cellular/SSSettings/tsrc/public/basic/group"/>
+ <unit bldFile="/sf/mw/phonesrv/cellular/telephonysettings/tsrc/public/basic/group"/>
+ </component>
+ </collection>
+ <collection name="convergedcallengine" long-name="Converged Call Engine" level="framework">
+ <component name="callprovider" filter="s60" long-name="Call Provider">
+ <unit bldFile="/sf/mw/phonesrv/convergedcallengine/callprovider/group"/>
+ </component>
+ <component name="cce" filter="s60" long-name="CCE">
+ <unit bldFile="/sf/mw/phonesrv/convergedcallengine/cce/group"/>
+ </component>
+ <component name="spsettings" filter="s60" long-name="Service Provider Settings">
+ <unit bldFile="/sf/mw/phonesrv/convergedcallengine/spsettings/group"/>
+ </component>
+ <component name="cenrepdatabase" filter="s60" long-name="CCE Cenrep Database">
+ <unit bldFile="/sf/mw/phonesrv/convergedcallengine/cenrepdatabase/group"/>
+ </component>
+ <component name="serviceselector" filter="s60" long-name="Service Selector">
+ <unit bldFile="/sf/mw/phonesrv/convergedcallengine/serviceselector/group"/>
+ </component>
+ <component name="csplugin" filter="s60" long-name="CS Plugin" plugin="Y">
+ <!-- should spell out CS in name -->
+ <unit bldFile="/sf/mw/phonesrv/convergedcallengine/csplugin/group"/>
+ </component>
+ <component name="convergedcallengine_test" filter="s60,api_test" long-name="CCE Tests" purpose="development">
+ <!-- can only have one unit. Need to #include from a single bld.inf (convergedcallengine/tsrc/bld.inf?) -->
+ <unit bldFile="/sf/mw/phonesrv/convergedcallengine/cce/tsrc/public/basic/group"/>
+ <unit bldFile="/sf/mw/phonesrv/convergedcallengine/spsettings/tsrc/public/basic/group"/>
+ </component>
+ </collection>
+ <collection name="engines" long-name="Telephony Engines" level="specific">
+ <component name="vmbxengine" filter="s60" long-name="Voice Mailbox Engine">
+ <unit bldFile="/sf/mw/phonesrv/engines/vmbxengine/group"/>
+ </component>
+ </collection>
+ <collection name="networkhandling" long-name="Network Handling" level="plugin">
+ <component name="networkhandlingengine" filter="s60" long-name="Network Handling Engine">
+ <unit bldFile="/sf/mw/phonesrv/networkhandling/networkhandlingengine/group"/>
+ </component>
+ </collection>
+ <collection name="phoneclientserver" long-name="Phone Client/Server" level="server">
+ <component name="enpolicy" filter="s60" long-name="Emergency Number Policy">
+ <unit bldFile="/sf/mw/phonesrv/phoneclientserver/enpolicy/group"/>
+ </component>
+ <component name="aiwdialdata" filter="s60" long-name="AIW Dial Data">
+ <unit bldFile="/sf/mw/phonesrv/phoneclientserver/aiwdialdata/group"/>
+ </component>
+ <component name="dialutils" filter="s60" long-name="Dial Utils">
+ <unit bldFile="/sf/mw/phonesrv/phoneclientserver/dialutils/group"/>
+ </component>
+ <component name="phoneclient" filter="s60" long-name="Phone Client">
+ <unit bldFile="/sf/mw/phonesrv/phoneclientserver/phoneclient/group"/>
+ </component>
+ <component name="phoneserver" filter="s60" long-name="Phone Server">
+ <unit bldFile="/sf/mw/phonesrv/phoneclientserver/phoneserver/group"/>
+ </component>
+ <component name="callui" filter="s60" long-name="Call UI">
+ <unit bldFile="/sf/mw/phonesrv/phoneclientserver/callui/group"/>
+ </component>
+ <component name="phoneclientserver_test" filter="s60,api_test" long-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 bldFile="/sf/mw/phonesrv/phoneclientserver/aiwdialdata/tsrc/public/basic/group"/>
+ <unit bldFile="/sf/mw/phonesrv/phoneclientserver/dialutils/tsrc/public/basic/group"/>
+ <unit bldFile="/sf/mw/phonesrv/phoneclientserver/phoneclient/tsrc/public/basic/group"/>
+ </component>
+ </collection>
+ <collection name="satengine" long-name="SIM Application Toolkit Engine" level="generic">
+ <component name="satserver" filter="s60" long-name="SAT Server">
+ <unit bldFile="/sf/mw/phonesrv/satengine/satserver/group"/>
+ </component>
+ </collection>
+ <collection name="satui" long-name="SIM Application Toolkit UI" level="specific">
+ <component name="satapp" filter="s60" long-name="SAT Application">
+ <unit bldFile="/sf/mw/phonesrv/satui/satapp/group"/>
+ </component>
+ <component name="satplugin" filter="s60" long-name="SAT Plugin" plugin="Y">
+ <unit bldFile="/sf/mw/phonesrv/satui/satplugin/group"/>
+ </component>
+ </collection>
+ <collection name="phonecmdhandler" long-name="Phone Command Handler" level="generic">
+ <component name="phonecmdhnlr" filter="s60" long-name="Phone Command Handler">
+ <unit bldFile="/sf/mw/phonesrv/phonecmdhandler/phonecmdhnlr/group"/>
+ </component>
+ </collection>
+ <collection name="phonesrv_info" long-name="Telephony and SIM Services Info" level="specific">
+ <component name="phonesrv_plat" filter="s60" long-name="Telephony and SIM Services Platform Interfaces" class="api">
+ <unit bldFile="/sf/mw/phonesrv/phonesrv_plat/group"/>
+ </component>
+ <component name="phonesrv_pub" filter="s60" long-name="Telephony and SIM Services Public Interfaces" class="api">
+ <unit bldFile="/sf/mw/phonesrv/phonesrv_pub/group"/>
+ </component>
+ <component name="phonesrv_test" filter="s60,api_test" long-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 bldFile="/sf/mw/phonesrv/phonesrv_plat/call_information_api/tsrc/group"/>
+ <unit bldFile="/sf/mw/phonesrv/phonesrv_plat/sat_client_api/tsrc/group"/>
+ <unit bldFile="/sf/mw/phonesrv/phonesrv_plat/sat_refresh_api/tsrc/group"/>
+ <unit bldFile="/sf/mw/phonesrv/phonesrv_plat/sat_service_api/tsrc/group"/>
+ <unit bldFile="/sf/mw/phonesrv/phonesrv_plat/telephony_mediator_api/tsrc/ut_telephony_mediator_api/group"/>
+ <unit bldFile="/sf/mw/phonesrv/phonesrv_plat/call_remote_party_information_api/tsrc/group"/>
+ </component>
+ </collection>
+ </block>
+ </layer>
+ </systemModel>
</SystemDefinition>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/symbian3/mw/phonesrv/package_definition_3.0.xml Mon Feb 15 18:25:55 2010 +0000
@@ -0,0 +1,138 @@
+<?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="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">
+ <component id="cbsserver" filter="s60" name="CBS Server">
+ <unit bldFile="cbs/cbsserver/group"/>
+ </component>
+ <component id="cbsui" filter="s60" name="CBS UI">
+ <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"/>
+ </component>
+ <component id="cce" filter="s60" name="CCE">
+ <unit bldFile="convergedcallengine/cce/group"/>
+ </component>
+ <component id="spsettings" filter="s60" name="Service Provider Settings">
+ <unit bldFile="convergedcallengine/spsettings/group"/>
+ </component>
+ <component id="cenrepdatabase" filter="s60" name="CCE Cenrep Database">
+ <unit bldFile="convergedcallengine/cenrepdatabase/group"/>
+ </component>
+ <component id="serviceselector" filter="s60" name="Service Selector">
+ <unit bldFile="convergedcallengine/serviceselector/group"/>
+ </component>
+ <component id="csplugin" filter="s60" name="CS Plugin" class="plugin">
+ <!-- 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">
+ <unit bldFile="networkhandling/networkhandlingengine/group"/>
+ </component>
+ </collection>
+ <collection id="phoneclientserver" name="Phone Client/Server" level="server">
+ <component id="enpolicy" filter="s60" name="Emergency Number Policy">
+ <unit bldFile="phoneclientserver/enpolicy/group"/>
+ </component>
+ <component id="aiwdialdata" filter="s60" name="AIW Dial Data">
+ <unit bldFile="phoneclientserver/aiwdialdata/group"/>
+ </component>
+ <component id="dialutils" filter="s60" name="Dial Utils">
+ <unit bldFile="phoneclientserver/dialutils/group"/>
+ </component>
+ <component id="phoneclient" filter="s60" name="Phone Client">
+ <unit bldFile="phoneclientserver/phoneclient/group"/>
+ </component>
+ <component id="phoneserver" filter="s60" name="Phone Server">
+ <unit bldFile="phoneclientserver/phoneserver/group"/>
+ </component>
+ <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="SIM Application Toolkit Engine" level="generic">
+ <component id="satserver" filter="s60" name="SAT Server">
+ <unit bldFile="satengine/satserver/group"/>
+ </component>
+ </collection>
+ <collection id="satui" name="SIM Application Toolkit UI" level="specific">
+ <component id="satapp" filter="s60" name="SAT Application">
+ <unit bldFile="satui/satapp/group"/>
+ </component>
+ <component id="satplugin" filter="s60" name="SAT Plugin" class="plugin">
+ <unit bldFile="satui/satplugin/group"/>
+ </component>
+ </collection>
+ <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"/>
+ </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.xml Fri Feb 12 16:37:22 2010 +0000
+++ b/symbian3/mw/platformtools/package_definition.xml Mon Feb 15 18:25:55 2010 +0000
@@ -1,109 +1,91 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE SystemDefinition [
- <!ELEMENT SystemDefinition (systemModel?,SystemBuild?)>
- <!ATTLIST SystemDefinition
- name CDATA #REQUIRED
- schema CDATA #REQUIRED>
- <!ELEMENT systemModel (layer+)>
- <!ELEMENT layer (block*|collection*)*>
- <!ATTLIST layer
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED
- levels NMTOKENS #IMPLIED
- span CDATA #IMPLIED>
- <!ELEMENT block (subblock*|collection*)*>
- <!ATTLIST block
- levels NMTOKENS #IMPLIED
- span CDATA #IMPLIED
- level NMTOKEN #IMPLIED
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED>
- <!ELEMENT subblock (collection)*>
- <!ATTLIST subblock
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED>
- <!ELEMENT collection (component)*>
- <!ATTLIST collection
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED
- level NMTOKEN #IMPLIED>
- <!ELEMENT component (unit)*>
- <!ATTLIST component
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED
- deprecated CDATA #IMPLIED
- introduced CDATA #IMPLIED
- contract CDATA #IMPLIED
- plugin (Y|N) 'N'
- filter CDATA #IMPLIED
- class NMTOKENS #IMPLIED
- supports CDATA #IMPLIED
- purpose (optional|mandatory|development) 'optional'>
- <!ELEMENT unit EMPTY>
- <!ATTLIST unit
- mrp CDATA #IMPLIED
- filter CDATA #IMPLIED
- bldFile CDATA #IMPLIED
- root CDATA #IMPLIED
- version NMTOKEN #IMPLIED
- prebuilt NMTOKEN #IMPLIED
- late (Y|N) #IMPLIED
- priority CDATA #IMPLIED>
- <!ELEMENT SystemBuild (option*|target+|targetList+|list+|configuration+)*>
- <!ATTLIST SystemBuild schema CDATA #REQUIRED>
- <!ELEMENT list (ref+)>
- <!ATTLIST list
- name ID #REQUIRED
- description CDATA #REQUIRED>
- <!ELEMENT ref EMPTY>
- <!ATTLIST ref item CDATA #REQUIRED>
- <!ELEMENT targetList EMPTY>
- <!ATTLIST targetList
- name ID #REQUIRED
- description CDATA #REQUIRED
- target IDREFS #REQUIRED>
- <!ELEMENT target EMPTY>
- <!ATTLIST target
- name ID #REQUIRED
- abldTarget CDATA #REQUIRED
- description CDATA #REQUIRED>
- <!ELEMENT option EMPTY>
- <!ATTLIST option
- name ID #REQUIRED
- abldOption CDATA #REQUIRED
- description CDATA #REQUIRED
- enable (Y|N) #REQUIRED>
- <!ELEMENT configuration (listRef+|ref+|task+)*>
- <!ATTLIST configuration
- name ID #REQUIRED
- description CDATA #REQUIRED
- filter CDATA #REQUIRED>
- <!ELEMENT task (listRef*,(buildLayer|specialInstructions))>
- <!ELEMENT listRef EMPTY>
- <!ATTLIST listRef list CDATA #REQUIRED>
- <!ELEMENT buildLayer EMPTY>
- <!ATTLIST buildLayer
- command CDATA #REQUIRED
- targetList IDREFS #IMPLIED
- unitParallel (Y|N) #REQUIRED
- targetParallel (Y|N) 'N'>
- <!ELEMENT specialInstructions EMPTY>
- <!ATTLIST specialInstructions
- name CDATA #REQUIRED
- cwd CDATA #REQUIRED
- root CDATA #IMPLIED
- command CDATA #REQUIRED>
-]>
-<SystemDefinition schema="2.0.1" name="Symbian^3">
-<systemModel>
-<layer name="mw">
-<block name="platformtools">
-<collection name="s60">
-<component name="platformtools">
-<unit bldFile="/sf/mw/platformtools/group" mrp=""/>
-</component>
-</collection>
-</block>
-</layer>
-</systemModel>
+<!DOCTYPE SystemDefinition [
+<!ELEMENT SystemDefinition ( systemModel )>
+<!ATTLIST SystemDefinition
+ name CDATA #REQUIRED
+ schema CDATA #REQUIRED
+>
+<!-- all paths are relative to the environment variable specified by the root attribute, or SOURCEROOT if not. -->
+
+<!-- System Model Section of DTD -->
+<!ELEMENT systemModel (layer+)>
+
+<!ELEMENT layer (block* | collection*)*>
+<!-- Kernel Services, Base Services, OS Services, Etc -->
+<!ATTLIST layer
+ name CDATA #REQUIRED
+ long-name CDATA #IMPLIED
+ levels NMTOKENS #IMPLIED
+ span CDATA #IMPLIED
+>
+
+<!ELEMENT block (subblock* | collection*)*>
+ <!-- Generic OS services, Comms Services, etc -->
+<!ATTLIST block
+ levels NMTOKENS #IMPLIED
+ span CDATA #IMPLIED
+ level NMTOKEN #IMPLIED
+ name CDATA #REQUIRED
+ long-name CDATA #IMPLIED
+>
+
+<!ELEMENT subblock (collection)*>
+<!-- Cellular Baseband Services, Networking Services, etc -->
+<!ATTLIST subblock
+ name CDATA #REQUIRED
+ long-name CDATA #IMPLIED
+>
+
+<!ELEMENT collection (component)*>
+<!-- Screen Driver, Content Handling, etc -->
+<!ATTLIST collection
+ name CDATA #REQUIRED
+ long-name CDATA #IMPLIED
+ level NMTOKEN #IMPLIED
+>
+
+<!ELEMENT component (unit)*>
+<!-- contains units or is a package or prebuilt -->
+<!ATTLIST component
+ name CDATA #REQUIRED
+ long-name CDATA #IMPLIED
+ deprecated CDATA #IMPLIED
+ introduced CDATA #IMPLIED
+ contract CDATA #IMPLIED
+ plugin (Y|N) "N"
+ filter CDATA #IMPLIED
+ class NMTOKENS #IMPLIED
+ supports CDATA #IMPLIED
+ purpose ( optional | mandatory | development ) "optional"
+>
+
+<!ELEMENT unit EMPTY >
+<!-- must be buildable (bld.inf) -->
+<!-- bldFile may someday be removed in favour of mrp -->
+<!ATTLIST unit
+ mrp CDATA #IMPLIED
+ filter CDATA #IMPLIED
+ bldFile CDATA #IMPLIED
+ root CDATA #IMPLIED
+ version NMTOKEN #IMPLIED
+ prebuilt NMTOKEN #IMPLIED
+ late (Y|N) #IMPLIED
+ priority CDATA #IMPLIED
+>
+]>
+<SystemDefinition name="Symbian^3" schema="2.0.1">
+ <systemModel>
+ <layer name="mw" long-name="Middleware" levels="generic specific">
+ <block name="platformtools" level="generic" long-name="Platform Tools">
+ <collection name="gfxconversion" long-name="Graphics Conversion">
+ <component name="bmconv_s60" filter="s60" long-name="S60 Bitmap Converter" class="PC">
+ <unit bldFile="/sf/mw/platformtools/gfxconversion/bmconv_s60/group"/>
+ </component>
+ <component name="mifconv" filter="s60" long-name="Multi Icon File Converter" class="PC">
+ <unit bldFile="/sf/mw/platformtools/gfxconversion/mifconv/group"/>
+ </component>
+ </collection>
+ </block>
+ </layer>
+ </systemModel>
</SystemDefinition>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/symbian3/mw/platformtools/package_definition_3.0.xml Mon Feb 15 18:25:55 2010 +0000
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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" target="desktop">
+ <unit bldFile="gfxconversion/bmconv_s60/group"/>
+ </component>
+ <component id="mifconv" filter="s60" name="Multi Icon File Converter" target="desktop">
+ <unit bldFile="gfxconversion/mifconv/group"/>
+ </component>
+ </collection>
+ </package>
+</SystemDefinition>
--- a/symbian3/mw/remoteconn/package_definition.xml Fri Feb 12 16:37:22 2010 +0000
+++ b/symbian3/mw/remoteconn/package_definition.xml Mon Feb 15 18:25:55 2010 +0000
@@ -1,180 +1,133 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE SystemDefinition [
- <!ELEMENT SystemDefinition (systemModel?,SystemBuild?)>
- <!ATTLIST SystemDefinition
- name CDATA #REQUIRED
- schema CDATA #REQUIRED>
- <!ELEMENT systemModel (layer+)>
- <!ELEMENT layer (block*|collection*)*>
- <!ATTLIST layer
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED
- levels NMTOKENS #IMPLIED
- span CDATA #IMPLIED>
- <!ELEMENT block (subblock*|collection*)*>
- <!ATTLIST block
- levels NMTOKENS #IMPLIED
- span CDATA #IMPLIED
- level NMTOKEN #IMPLIED
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED>
- <!ELEMENT subblock (collection)*>
- <!ATTLIST subblock
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED>
- <!ELEMENT collection (component)*>
- <!ATTLIST collection
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED
- level NMTOKEN #IMPLIED>
- <!ELEMENT component (unit)*>
- <!ATTLIST component
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED
- deprecated CDATA #IMPLIED
- introduced CDATA #IMPLIED
- contract CDATA #IMPLIED
- plugin (Y|N) 'N'
- filter CDATA #IMPLIED
- class NMTOKENS #IMPLIED
- supports CDATA #IMPLIED
- purpose (optional|mandatory|development) 'optional'>
- <!ELEMENT unit EMPTY>
- <!ATTLIST unit
- mrp CDATA #IMPLIED
- filter CDATA #IMPLIED
- bldFile CDATA #IMPLIED
- root CDATA #IMPLIED
- version NMTOKEN #IMPLIED
- prebuilt NMTOKEN #IMPLIED
- late (Y|N) #IMPLIED
- priority CDATA #IMPLIED>
- <!ELEMENT SystemBuild (option*|target+|targetList+|list+|configuration+)*>
- <!ATTLIST SystemBuild schema CDATA #REQUIRED>
- <!ELEMENT list (ref+)>
- <!ATTLIST list
- name ID #REQUIRED
- description CDATA #REQUIRED>
- <!ELEMENT ref EMPTY>
- <!ATTLIST ref item CDATA #REQUIRED>
- <!ELEMENT targetList EMPTY>
- <!ATTLIST targetList
- name ID #REQUIRED
- description CDATA #REQUIRED
- target IDREFS #REQUIRED>
- <!ELEMENT target EMPTY>
- <!ATTLIST target
- name ID #REQUIRED
- abldTarget CDATA #REQUIRED
- description CDATA #REQUIRED>
- <!ELEMENT option EMPTY>
- <!ATTLIST option
- name ID #REQUIRED
- abldOption CDATA #REQUIRED
- description CDATA #REQUIRED
- enable (Y|N) #REQUIRED>
- <!ELEMENT configuration (listRef+|ref+|task+)*>
- <!ATTLIST configuration
- name ID #REQUIRED
- description CDATA #REQUIRED
- filter CDATA #REQUIRED>
- <!ELEMENT task (listRef*,(buildLayer|specialInstructions))>
- <!ELEMENT listRef EMPTY>
- <!ATTLIST listRef list CDATA #REQUIRED>
- <!ELEMENT buildLayer EMPTY>
- <!ATTLIST buildLayer
- command CDATA #REQUIRED
- targetList IDREFS #IMPLIED
- unitParallel (Y|N) #REQUIRED
- targetParallel (Y|N) 'N'>
- <!ELEMENT specialInstructions EMPTY>
- <!ATTLIST specialInstructions
- name CDATA #REQUIRED
- cwd CDATA #REQUIRED
- root CDATA #IMPLIED
- command CDATA #REQUIRED>
-]>
-<SystemDefinition schema="2.0.1" name="Symbian^3">
-<systemModel>
-<layer name="mw" long-name="Middleware" levels="generic specific">
-<block name="remoteconn" level="generic" long-name="Remote Connectivity" levels="plugin framework server generic specific">
-<collection name="remoteconn_info" long-name="Remote Connectivity Info" level="specific">
-<component name="remoteconn_metadata" long-name="Remote Connectivity Metadata" introduced="tb91" purpose="development" class="config PC">
-<unit mrp="/sf/mw/remoteconn/remoteconn_info/remoteconn_metadata/remoteconn_metadata.mrp"/>
-</component>
-</collection>
-<collection name="usbfunctiondrivers" long-name="USB Function Drivers" level="server">
-<component name="massstoragemgr" long-name="Mass Storage Manager" introduced="tb92" purpose="optional">
-<unit bldFile="/sf/mw/remoteconn/usbfunctiondrivers/massstoragemgr/group" mrp="/sf/mw/remoteconn/usbfunctiondrivers/massstoragemgr/group/connectivity_usbms.mrp"/>
-</component>
-</collection>
-<collection name="connectivitytransports" long-name="Connectivity Transports" level="plugin">
-<component name="plpremotelink" long-name="PLP Remote Link" deprecated="9.0" purpose="optional">
-<unit bldFile="/sf/mw/remoteconn/connectivitytransports/plpremotelink/group" mrp="/sf/mw/remoteconn/connectivitytransports/plpremotelink/group/connectivity_legacy_plp_plpremotelink.mrp"/>
-</component>
-<component name="plpvariant" long-name="PLP Variant" deprecated="9.0" purpose="optional">
-<unit bldFile="/sf/mw/remoteconn/connectivitytransports/plpvariant/group" mrp="/sf/mw/remoteconn/connectivitytransports/plpvariant/group/connectivity_legacy_plp_plpvariant.mrp"/>
-</component>
-</collection>
-<collection name="mtptransports" long-name="MTP Transports" level="plugin">
-<component name="mtpusbtransport" long-name="MTP USB Transport" introduced="tb91" purpose="optional" plugin="Y">
-<unit bldFile="/sf/mw/remoteconn/mtptransports/mtpusbtransport/group" mrp="/sf/mw/remoteconn/mtptransports/mtpusbtransport/group/mtp_usbsic.mrp"/>
-</component>
-<component name="mtpptpiptransport" long-name="MTP PTP-IP Transport" introduced="tb92" purpose="optional" plugin="Y">
-<unit bldFile="/sf/mw/remoteconn/mtptransports/mtpptpiptransport/group" mrp="/sf/mw/remoteconn/mtptransports/mtpptpiptransport/group/mtp_ptpip.mrp"/>
-</component>
-</collection>
-<collection name="mtpfws" long-name="MTP Frameworks" level="framework">
-<component name="mtpfw" long-name="MTP Framework" introduced="tb91" purpose="optional">
-<unit bldFile="/sf/mw/remoteconn/mtpfws/mtpfw/group" mrp="/sf/mw/remoteconn/mtpfws/mtpfw/group/mtp_framework.mrp"/>
-</component>
-<component name="mtpintegrationtest" long-name="MTP Integration Test" introduced="tb91" purpose="development">
-<unit bldFile="/sf/mw/remoteconn/mtpfws/mtpintegrationtest/group" mrp="/sf/mw/remoteconn/mtpfws/mtpintegrationtest/group/mtp_test.mrp"/>
-</component>
-</collection>
-<collection name="mtpdataproviders" long-name="MTP Data Providers" level="generic">
-<component name="mtpfileandfolderdp" long-name="MTP File and Folder Provider" introduced="tb91" purpose="optional" plugin="Y">
-<unit bldFile="/sf/mw/remoteconn/mtpdataproviders/mtpfileandfolderdp/group" mrp="/sf/mw/remoteconn/mtpdataproviders/mtpfileandfolderdp/group/mtp_filedp.mrp"/>
-</component>
-<component name="mtpbackupandrestoredp" long-name="Backup and Restore Provider" introduced="tb92" purpose="optional" plugin="Y">
-<unit bldFile="/sf/mw/remoteconn/mtpdataproviders/mtpbackupandrestoredp/group" mrp="/sf/mw/remoteconn/mtpdataproviders/mtpbackupandrestoredp/group/mtp_backupnrestoredp.mrp"/>
-</component>
-</collection>
-<collection name="backupandrestore" long-name="Backup and Restore" level="specific">
-<component name="backupengine" long-name="Backup Engine" introduced="9.0" purpose="optional">
-<unit bldFile="/sf/mw/remoteconn/backupandrestore/backupengine/group" mrp="/sf/mw/remoteconn/backupandrestore/backupengine/group/connectivity_backupengine.mrp"/>
-</component>
-<component name="backuptest" long-name="Backup Test" introduced="tb91" purpose="development">
-<unit bldFile="/sf/mw/remoteconn/backupandrestore/backuptest/group" mrp="/sf/mw/remoteconn/backupandrestore/backuptest/group/connectivity_backuptest.mrp"/>
-</component>
-</collection>
-<collection name="connectivitypcside" long-name="Connectivity PC Side" level="generic">
-<component name="chatscripts" long-name="Chat Scripts" purpose="development">
-<unit bldFile="/sf/mw/remoteconn/connectivitypcside/chatscripts/group" mrp="/sf/mw/remoteconn/connectivitypcside/chatscripts/group/testtools_chatscripts.mrp"/>
-</component>
-</collection>
-<collection name="connectivitydevicefws" long-name="Connectivity Device Frameworks" level="framework">
-<component name="connectivityfw" long-name="Connectivity Framework" introduced="7.0s" deprecated="tb91" purpose="optional">
-<unit bldFile="/sf/mw/remoteconn/connectivitydevicefws/connectivityfw/group" mrp="/sf/mw/remoteconn/connectivitydevicefws/connectivityfw/group/connectivity_framework.mrp"/>
-</component>
-<component name="connectivityservices" long-name="Connectivity Services" introduced="7.0s" deprecated="tb91" purpose="optional">
-<unit bldFile="/sf/mw/remoteconn/connectivitydevicefws/connectivityservices/group" mrp="/sf/mw/remoteconn/connectivitydevicefws/connectivityservices/group/connectivity_services.mrp"/>
-</component>
-</collection>
-<collection name="obex" long-name="OBEX" level="generic">
-<component name="obexprotocol" long-name="OBEX Protocol" introduced="9.1" purpose="optional">
-<unit bldFile="/sf/mw/remoteconn/obex/obexprotocol/group" mrp="/sf/mw/remoteconn/obex/obexprotocol/group/obex.mrp"/>
-</component>
-<component name="obexextensionapi" long-name="OBEX Extension API" introduced="9.2" purpose="optional">
-<unit bldFile="/sf/mw/remoteconn/obex/obexextensionapi/group" mrp="/sf/mw/remoteconn/obex/obexextensionapi/group/obex_extensionapis.mrp"/>
-</component>
-</collection>
-<collection name="s60">
-<component name="remoteconn">
-<unit bldFile="/sf/mw/remoteconn/group" mrp=""/>
-</component>
-</collection>
-</block>
-</layer>
-</systemModel>
-</SystemDefinition>
\ No newline at end of file
+<!DOCTYPE SystemDefinition [
+<!ELEMENT SystemDefinition ( systemModel )>
+<!ATTLIST SystemDefinition
+ name CDATA #REQUIRED
+ schema CDATA #REQUIRED
+>
+<!-- all paths are relative to the environment variable specified by the root attribute, or SOURCEROOT if not. -->
+
+<!-- System Model Section of DTD -->
+<!ELEMENT systemModel (layer+)>
+
+<!ELEMENT layer (block* | collection*)*>
+<!-- Kernel Services, Base Services, OS Services, Etc -->
+<!ATTLIST layer
+ name CDATA #REQUIRED
+ long-name CDATA #IMPLIED
+ levels NMTOKENS #IMPLIED
+ span CDATA #IMPLIED
+>
+
+<!ELEMENT block (subblock* | collection*)*>
+ <!-- Generic OS services, Comms Services, etc -->
+<!ATTLIST block
+ levels NMTOKENS #IMPLIED
+ span CDATA #IMPLIED
+ level NMTOKEN #IMPLIED
+ name CDATA #REQUIRED
+ long-name CDATA #IMPLIED
+>
+
+<!ELEMENT subblock (collection)*>
+<!-- Cellular Baseband Services, Networking Services, etc -->
+<!ATTLIST subblock
+ name CDATA #REQUIRED
+ long-name CDATA #IMPLIED
+>
+
+<!ELEMENT collection (component)*>
+<!-- Screen Driver, Content Handling, etc -->
+<!ATTLIST collection
+ name CDATA #REQUIRED
+ long-name CDATA #IMPLIED
+ level NMTOKEN #IMPLIED
+>
+
+<!ELEMENT component (unit)*>
+<!-- contains units or is a package or prebuilt -->
+<!ATTLIST component
+ name CDATA #REQUIRED
+ long-name CDATA #IMPLIED
+ deprecated CDATA #IMPLIED
+ introduced CDATA #IMPLIED
+ contract CDATA #IMPLIED
+ plugin (Y|N) "N"
+ filter CDATA #IMPLIED
+ class NMTOKENS #IMPLIED
+ supports CDATA #IMPLIED
+ purpose ( optional | mandatory | development ) "optional"
+>
+
+<!ELEMENT unit EMPTY >
+<!-- must be buildable (bld.inf) -->
+<!-- bldFile may someday be removed in favour of mrp -->
+<!ATTLIST unit
+ mrp CDATA #IMPLIED
+ filter CDATA #IMPLIED
+ bldFile CDATA #IMPLIED
+ root CDATA #IMPLIED
+ version NMTOKEN #IMPLIED
+ prebuilt NMTOKEN #IMPLIED
+ late (Y|N) #IMPLIED
+ priority CDATA #IMPLIED
+>
+]>
+<SystemDefinition name="Symbian^3" schema="2.0.1">
+ <systemModel>
+ <layer name="mw" long-name="Middleware" levels="generic specific">
+ <block name="remoteconn" level="generic" long-name="Remote Connectivity" levels="plugin framework server generic specific">
+ <collection name="connectivitymodules" long-name="Connectivity Modules" level="framework">
+ <component name="secon" filter="s60" long-name="Service Controllers">
+ <unit bldFile="/sf/mw/remoteconn/connectivitymodules/secon/group"/>
+ </component>
+ </collection>
+ <collection name="remoteconn_info" long-name="Remote Connectivity Info" level="specific">
+ <component name="remoteconn_plat" filter="s60" long-name="Remote Connectivity Platform Interfaces" class="api">
+ <unit bldFile="/sf/mw/remoteconn/remoteconn_plat/group"/>
+ </component>
+ <component name="remoteconn_metadata" long-name="Remote Connectivity Metadata" introduced="^2" purpose="development" class="config PC">
+ <unit mrp="/sf/mw/remoteconn/remoteconn_info/remoteconn_metadata/remoteconn_metadata.mrp"/>
+ </component>
+ </collection>
+ <collection name="mtptransports" long-name="MTP Transports" level="plugin">
+ <component name="mtpusbtransport" long-name="MTP USB Transport" introduced="^2" purpose="optional" plugin="Y">
+ <unit bldFile="/sf/mw/remoteconn/mtptransports/mtpusbtransport/group" mrp="/sf/mw/remoteconn/mtptransports/mtpusbtransport/group/mtp_usbsic.mrp"/>
+ </component>
+ <component name="mtpptpiptransport" long-name="MTP PTP-IP Transport" introduced="^3" purpose="optional" plugin="Y">
+ <unit bldFile="/sf/mw/remoteconn/mtptransports/mtpptpiptransport/group" mrp="/sf/mw/remoteconn/mtptransports/mtpptpiptransport/group/mtp_ptpip.mrp"/>
+ </component>
+ <component name="mtpcontroller" long-name="MTP Controller" introduced="^3" purpose="optional" plugin="Y">
+ <unit bldFile="/sf/mw/remoteconn/mtptransports/mtpcontroller/group" mrp="/sf/mw/remoteconn/mtptransports/mtpcontroller/group/mtpcontroller.mrp"/>
+ </component>
+ </collection>
+ <collection name="mtpfws" long-name="MTP Frameworks" level="framework">
+ <component name="mtpfw" long-name="MTP Framework" introduced="^2" purpose="optional">
+ <unit bldFile="/sf/mw/remoteconn/mtpfws/mtpfw/group" mrp="/sf/mw/remoteconn/mtpfws/mtpfw/group/mtp_framework.mrp"/>
+ </component>
+ </collection>
+ <collection name="mtpdataproviders" long-name="MTP Data Providers" level="generic">
+ <component name="mtpfileandfolderdp" long-name="MTP File and Folder Provider" introduced="^2" purpose="optional" plugin="Y">
+ <unit bldFile="/sf/mw/remoteconn/mtpdataproviders/mtpfileandfolderdp/group" mrp="/sf/mw/remoteconn/mtpdataproviders/mtpfileandfolderdp/group/mtp_filedp.mrp"/>
+ </component>
+ </collection>
+ <collection name="backupandrestore" long-name="Backup and Restore" level="specific">
+ <component name="backupengine" long-name="Backup Engine" introduced="9.0" purpose="optional">
+ <unit bldFile="/sf/mw/remoteconn/backupandrestore/backupengine/group" mrp="/sf/mw/remoteconn/backupandrestore/backupengine/group/connectivity_backupengine.mrp"/>
+ </component>
+ <component name="backuptest" long-name="Backup Test" introduced="^2" purpose="development">
+ <unit bldFile="/sf/mw/remoteconn/backupandrestore/backuptest/group" mrp="/sf/mw/remoteconn/backupandrestore/backuptest/group/connectivity_backuptest.mrp"/>
+ </component>
+ </collection>
+ <collection name="obex" long-name="OBEX" level="generic">
+ <component name="obexprotocol" long-name="OBEX Protocol" introduced="9.1" purpose="optional">
+ <unit bldFile="/sf/mw/remoteconn/obex/obexprotocol/group" mrp="/sf/mw/remoteconn/obex/obexprotocol/group/obex.mrp"/>
+ </component>
+ <component name="obexextensionapi" long-name="OBEX Extension API" introduced="9.2" purpose="optional">
+ <unit bldFile="/sf/mw/remoteconn/obex/obexextensionapi/group" mrp="/sf/mw/remoteconn/obex/obexextensionapi/group/obex_extensionapis.mrp"/>
+ </component>
+ </collection>
+ </block>
+ </layer>
+ </systemModel>
+</SystemDefinition>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/symbian3/mw/remoteconn/package_definition_3.0.xml Mon Feb 15 18:25:55 2010 +0000
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<SystemDefinition schema="3.0.0">
+ <package id="remoteconn" name="Remote Connectivity" levels="plugin framework server generic specific">
+ <collection id="connectivitymodules" name="Connectivity Modules" level="framework">
+ <component id="secon" filter="s60" name="Service Controllers">
+ <unit bldFile="connectivitymodules/secon/group"/>
+ </component>
+ </collection>
+ <collection id="remoteconn_info" name="Remote Connectivity Info" level="specific">
+ <component id="remoteconn_plat" filter="s60" name="Remote Connectivity Platform Interfaces" class="api">
+ <unit bldFile="remoteconn_plat/group"/>
+ </component>
+ <component id="remoteconn_metadata" name="Remote Connectivity Metadata" class="config" introduced="^2" purpose="development" target="desktop">
+ <unit mrp="remoteconn_info/remoteconn_metadata/remoteconn_metadata.mrp"/>
+ </component>
+ </collection>
+ <collection id="mtptransports" name="MTP Transports" level="plugin">
+ <component id="mtpusbtransport" name="MTP USB Transport" introduced="^2" purpose="optional" class="plugin">
+ <unit bldFile="mtptransports/mtpusbtransport/group" mrp="mtptransports/mtpusbtransport/group/mtp_usbsic.mrp"/>
+ </component>
+ <component id="mtpptpiptransport" name="MTP PTP-IP Transport" introduced="^3" purpose="optional" class="plugin">
+ <unit bldFile="mtptransports/mtpptpiptransport/group" mrp="mtptransports/mtpptpiptransport/group/mtp_ptpip.mrp"/>
+ </component>
+ <component id="mtpcontroller" name="MTP Controller" introduced="^3" purpose="optional" class="plugin">
+ <unit bldFile="mtptransports/mtpcontroller/group" mrp="mtptransports/mtpcontroller/group/mtpcontroller.mrp"/>
+ </component>
+ </collection>
+ <collection id="mtpfws" name="MTP Frameworks" level="framework">
+ <component id="mtpfw" name="MTP Framework" introduced="^2" purpose="optional">
+ <unit bldFile="mtpfws/mtpfw/group" mrp="mtpfws/mtpfw/group/mtp_framework.mrp"/>
+ </component>
+
+ </collection>
+ <collection id="mtpdataproviders" name="MTP Data Providers" level="generic">
+ <component id="mtpfileandfolderdp" name="MTP File and Folder Provider" introduced="^2" purpose="optional" class="plugin">
+ <unit bldFile="mtpdataproviders/mtpfileandfolderdp/group" mrp="mtpdataproviders/mtpfileandfolderdp/group/mtp_filedp.mrp"/>
+ </component>
+ </collection>
+ <collection id="backupandrestore" name="Backup and Restore" level="specific">
+ <component id="backupengine" name="Backup Engine" introduced="9.0" purpose="optional">
+ <unit bldFile="backupandrestore/backupengine/group" mrp="backupandrestore/backupengine/group/connectivity_backupengine.mrp"/>
+ </component>
+ <component id="backuptest" name="Backup Test" introduced="^2" purpose="development">
+ <unit bldFile="backupandrestore/backuptest/group" mrp="backupandrestore/backuptest/group/connectivity_backuptest.mrp"/>
+ </component>
+ </collection>
+ <collection id="obex" name="OBEX" level="generic">
+ <component id="obexprotocol" name="OBEX Protocol" introduced="9.1" purpose="optional">
+ <unit bldFile="obex/obexprotocol/group" mrp="obex/obexprotocol/group/obex.mrp"/>
+ </component>
+ <component id="obexextensionapi" name="OBEX Extension API" introduced="9.2" purpose="optional">
+ <unit bldFile="obex/obexextensionapi/group" mrp="obex/obexextensionapi/group/obex_extensionapis.mrp"/>
+ </component>
+ </collection>
+ </package>
+</SystemDefinition>
--- a/symbian3/mw/remotemgmt/package_definition.xml Fri Feb 12 16:37:22 2010 +0000
+++ b/symbian3/mw/remotemgmt/package_definition.xml Mon Feb 15 18:25:55 2010 +0000
@@ -1,109 +1,184 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE SystemDefinition [
- <!ELEMENT SystemDefinition (systemModel?,SystemBuild?)>
- <!ATTLIST SystemDefinition
- name CDATA #REQUIRED
- schema CDATA #REQUIRED>
- <!ELEMENT systemModel (layer+)>
- <!ELEMENT layer (block*|collection*)*>
- <!ATTLIST layer
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED
- levels NMTOKENS #IMPLIED
- span CDATA #IMPLIED>
- <!ELEMENT block (subblock*|collection*)*>
- <!ATTLIST block
- levels NMTOKENS #IMPLIED
- span CDATA #IMPLIED
- level NMTOKEN #IMPLIED
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED>
- <!ELEMENT subblock (collection)*>
- <!ATTLIST subblock
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED>
- <!ELEMENT collection (component)*>
- <!ATTLIST collection
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED
- level NMTOKEN #IMPLIED>
- <!ELEMENT component (unit)*>
- <!ATTLIST component
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED
- deprecated CDATA #IMPLIED
- introduced CDATA #IMPLIED
- contract CDATA #IMPLIED
- plugin (Y|N) 'N'
- filter CDATA #IMPLIED
- class NMTOKENS #IMPLIED
- supports CDATA #IMPLIED
- purpose (optional|mandatory|development) 'optional'>
- <!ELEMENT unit EMPTY>
- <!ATTLIST unit
- mrp CDATA #IMPLIED
- filter CDATA #IMPLIED
- bldFile CDATA #IMPLIED
- root CDATA #IMPLIED
- version NMTOKEN #IMPLIED
- prebuilt NMTOKEN #IMPLIED
- late (Y|N) #IMPLIED
- priority CDATA #IMPLIED>
- <!ELEMENT SystemBuild (option*|target+|targetList+|list+|configuration+)*>
- <!ATTLIST SystemBuild schema CDATA #REQUIRED>
- <!ELEMENT list (ref+)>
- <!ATTLIST list
- name ID #REQUIRED
- description CDATA #REQUIRED>
- <!ELEMENT ref EMPTY>
- <!ATTLIST ref item CDATA #REQUIRED>
- <!ELEMENT targetList EMPTY>
- <!ATTLIST targetList
- name ID #REQUIRED
- description CDATA #REQUIRED
- target IDREFS #REQUIRED>
- <!ELEMENT target EMPTY>
- <!ATTLIST target
- name ID #REQUIRED
- abldTarget CDATA #REQUIRED
- description CDATA #REQUIRED>
- <!ELEMENT option EMPTY>
- <!ATTLIST option
- name ID #REQUIRED
- abldOption CDATA #REQUIRED
- description CDATA #REQUIRED
- enable (Y|N) #REQUIRED>
- <!ELEMENT configuration (listRef+|ref+|task+)*>
- <!ATTLIST configuration
- name ID #REQUIRED
- description CDATA #REQUIRED
- filter CDATA #REQUIRED>
- <!ELEMENT task (listRef*,(buildLayer|specialInstructions))>
- <!ELEMENT listRef EMPTY>
- <!ATTLIST listRef list CDATA #REQUIRED>
- <!ELEMENT buildLayer EMPTY>
- <!ATTLIST buildLayer
- command CDATA #REQUIRED
- targetList IDREFS #IMPLIED
- unitParallel (Y|N) #REQUIRED
- targetParallel (Y|N) 'N'>
- <!ELEMENT specialInstructions EMPTY>
- <!ATTLIST specialInstructions
- name CDATA #REQUIRED
- cwd CDATA #REQUIRED
- root CDATA #IMPLIED
- command CDATA #REQUIRED>
-]>
-<SystemDefinition schema="2.0.1" name="Symbian^3">
-<systemModel>
-<layer name="mw">
-<block name="remotemgmt">
-<collection name="s60">
-<component name="remotemgmt">
-<unit bldFile="/sf/mw/remotemgmt/group" mrp=""/>
-</component>
-</collection>
-</block>
-</layer>
-</systemModel>
+<!DOCTYPE SystemDefinition [
+<!ELEMENT SystemDefinition ( systemModel )>
+<!ATTLIST SystemDefinition
+ name CDATA #REQUIRED
+ schema CDATA #REQUIRED
+>
+<!-- all paths are relative to the environment variable specified by the root attribute, or SOURCEROOT if not. -->
+
+<!-- System Model Section of DTD -->
+<!ELEMENT systemModel (layer+)>
+
+<!ELEMENT layer (block* | collection*)*>
+<!-- Kernel Services, Base Services, OS Services, Etc -->
+<!ATTLIST layer
+ name CDATA #REQUIRED
+ long-name CDATA #IMPLIED
+ levels NMTOKENS #IMPLIED
+ span CDATA #IMPLIED
+>
+
+<!ELEMENT block (subblock* | collection*)*>
+ <!-- Generic OS services, Comms Services, etc -->
+<!ATTLIST block
+ levels NMTOKENS #IMPLIED
+ span CDATA #IMPLIED
+ level NMTOKEN #IMPLIED
+ name CDATA #REQUIRED
+ long-name CDATA #IMPLIED
+>
+
+<!ELEMENT subblock (collection)*>
+<!-- Cellular Baseband Services, Networking Services, etc -->
+<!ATTLIST subblock
+ name CDATA #REQUIRED
+ long-name CDATA #IMPLIED
+>
+
+<!ELEMENT collection (component)*>
+<!-- Screen Driver, Content Handling, etc -->
+<!ATTLIST collection
+ name CDATA #REQUIRED
+ long-name CDATA #IMPLIED
+ level NMTOKEN #IMPLIED
+>
+
+<!ELEMENT component (unit)*>
+<!-- contains units or is a package or prebuilt -->
+<!ATTLIST component
+ name CDATA #REQUIRED
+ long-name CDATA #IMPLIED
+ deprecated CDATA #IMPLIED
+ introduced CDATA #IMPLIED
+ contract CDATA #IMPLIED
+ plugin (Y|N) "N"
+ filter CDATA #IMPLIED
+ class NMTOKENS #IMPLIED
+ supports CDATA #IMPLIED
+ purpose ( optional | mandatory | development ) "optional"
+>
+
+<!ELEMENT unit EMPTY >
+<!-- must be buildable (bld.inf) -->
+<!-- bldFile may someday be removed in favour of mrp -->
+<!ATTLIST unit
+ mrp CDATA #IMPLIED
+ filter CDATA #IMPLIED
+ bldFile CDATA #IMPLIED
+ root CDATA #IMPLIED
+ version NMTOKEN #IMPLIED
+ prebuilt NMTOKEN #IMPLIED
+ late (Y|N) #IMPLIED
+ priority CDATA #IMPLIED
+>
+]>
+<SystemDefinition name="Symbian^3" schema="2.0.1">
+ <systemModel>
+ <layer name="mw" long-name="Middleware" levels="generic specific">
+ <block name="remotemgmt" level="specific" long-name="Remote Management" levels="plugin framework server generic specific">
+ <collection name="policymanagement" long-name="Policy Management" level="generic">
+ <component name="pmdmadapter" filter="s60" long-name="PM DM Adapter" plugin="Y">
+ <unit bldFile="/sf/mw/remotemgmt/policymanagement/pmdmadapter/group"/>
+ </component>
+ <component name="dmutilserver" filter="s60" long-name="DM Util Server">
+ <unit bldFile="/sf/mw/remotemgmt/policymanagement/dmutilserver/group"/>
+ </component>
+ <component name="policyengine" filter="s60" long-name="Policy Engine">
+ <unit bldFile="/sf/mw/remotemgmt/policymanagement/policyengine/group"/>
+ </component>
+ <component name="policymanagement_build" filter="s60" long-name="Policy Management Build">
+ <!-- need to distribute exports, etc into the other components and remove this-->
+ <unit bldFile="/sf/mw/remotemgmt/policymanagement/group"/>
+ </component>
+ </collection>
+ <collection name="syncmlfw" long-name="SyncML Framework" level="server">
+ <component name="syncmlfw_build" filter="s60" long-name="SyncML Framework Build">
+ <!-- need to break this up into components. Too convoluted a structure to be in a single bld.inf-->
+ <unit bldFile="/sf/mw/remotemgmt/syncmlfw/group"/>
+ </component>
+ </collection>
+ <collection name="terminalsecurity" long-name="Terminal Security" level="specific">
+ <component name="scp" filter="s60" long-name="Security Code Proxy">
+ <!-- can only have one unit, need to have these #included from a single bld.inf -->
+ <unit bldFile="/sf/mw/remotemgmt/terminalsecurity/scp/scpclient/group"/>
+ <unit bldFile="/sf/mw/remotemgmt/terminalsecurity/scp/scpdatabase/group"/>
+ <unit bldFile="/sf/mw/remotemgmt/terminalsecurity/scp/scpserver/group"/>
+ <unit bldFile="/sf/mw/remotemgmt/terminalsecurity/scp/scppatternplugin/group"/>
+ <unit bldFile="/sf/mw/remotemgmt/terminalsecurity/scp/scphistoryplugin/group"/>
+ <unit bldFile="/sf/mw/remotemgmt/terminalsecurity/scp/scptimestampplugin/group"/>
+ <unit/>
+ <unit/>
+ </component>
+ <component name="terminalsecurity_client" filter="s60" long-name="Terminal Control Client">
+ <unit bldFile="/sf/mw/remotemgmt/terminalsecurity/client/group"/>
+ </component>
+ <component name="terminalsecurity_server" filter="s60" long-name="Terminal Control Server">
+ <unit bldFile="/sf/mw/remotemgmt/terminalsecurity/server/group"/>
+ </component>
+ <component name="tcadapter" filter="s60" long-name="Terminal Control Adapter">
+ <unit bldFile="/sf/mw/remotemgmt/terminalsecurity/tcadapter/bld"/>
+ </component>
+ <component name="terminalsecurity_build" filter="s60" long-name="Terminal Security Build">
+ <!-- need to distribute exports, etc into the other components and remove this-->
+ <unit bldFile="/sf/mw/remotemgmt/terminalsecurity/group"/>
+ </component>
+ </collection>
+ <collection name="omaprovisioning" long-name="OMA Provisioning" level="specific">
+ <component name="pnputil" filter="s60" long-name="PnP Util">
+ <unit bldFile="/sf/mw/remotemgmt/omaprovisioning/pnputil/group"/>
+ </component>
+ <component name="provisioning" filter="s60" long-name="Provisioning">
+ <unit bldFile="/sf/mw/remotemgmt/omaprovisioning/provisioning/group"/>
+ </component>
+ </collection>
+ <collection name="devicediagnosticsfw" long-name="Device Diagnostics Framework" level="framework">
+ <component name="diagframework" filter="s60" long-name="Diagnostics Framework">
+ <unit bldFile="/sf/mw/remotemgmt/devicediagnosticsfw/diagframework/group"/>
+ </component>
+ <component name="diagpluginbase" filter="s60" long-name="Diagnostics Plugin Base">
+ <unit bldFile="/sf/mw/remotemgmt/devicediagnosticsfw/diagpluginbase/group"/>
+ </component>
+ <component name="diagresultsdb" filter="s60" long-name="Diagnostics Results Database">
+ <!-- can only have one unit, merge or split into two components -->
+ <unit bldFile="/sf/mw/remotemgmt/devicediagnosticsfw/diagresultsdb/client/group"/>
+ <unit bldFile="/sf/mw/remotemgmt/devicediagnosticsfw/diagresultsdb/server/group"/>
+ </component>
+ <component name="devicediagnosticsfw_build" filter="s60" long-name="Device Diagnostics Framework Build">
+ <!-- need to distribute exports, etc into the other components and remove this-->
+ <unit bldFile="/sf/mw/remotemgmt/devicediagnosticsfw/group"/>
+ </component>
+ </collection>
+ <collection name="dcmofw" long-name="Device Capability Management Object Framework" level="framework">
+ <component name="dcmoclient" filter="s60" long-name="DCMO Client">
+ <unit bldFile="/sf/mw/remotemgmt/dcmofw/dcmoclient/group"/>
+ </component>
+ <component name="dcmoserver" filter="s60" long-name="DCMO Server">
+ <unit bldFile="/sf/mw/remotemgmt/dcmofw/dcmoserver/group"/>
+ </component>
+ <component name="dcmocustcmd" filter="s60" long-name="DCMO Custom Commands">
+ <unit bldFile="/sf/mw/remotemgmt/dcmofw/dcmocustcmd/group"/>
+ </component>
+ <component name="dcmofw_build" filter="s60" long-name="DCMO Build">
+ <!-- need to distribute exports, etc into the other components and remove this-->
+ <unit bldFile="/sf/mw/remotemgmt/dcmofw/group"/>
+ </component>
+ </collection>
+ <collection name="fotaapplication" long-name="FOTA Application" level="generic">
+ <!-- need to break up into components after resolving the #ifdefs -->
+ <component name="fotaapplication_build" filter="s60" long-name="FOTA Application Build">
+ <unit bldFile="/sf/mw/remotemgmt/fotaapplication/fotaserver/fotastartupextplg/group"/>
+ </component>
+ </collection>
+ <collection name="remotemgmt_info" long-name="Remote Management Info" level="specific">
+ <component name="remotemgmt_plat" filter="s60" long-name="Remote Management Platform Interfaces" class="api">
+ <unit bldFile="/sf/mw/remotemgmt/remotemgmt_plat/group"/>
+ </component>
+ <component name="remotemgmt_pub" filter="s60" long-name="Remote Management Public Interfaces" class="api">
+ <unit bldFile="/sf/mw/remotemgmt/remotemgmt_pub/group"/>
+ </component>
+ </collection>
+ </block>
+ </layer>
+ </systemModel>
</SystemDefinition>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/symbian3/mw/remotemgmt/package_definition_3.0.xml Mon Feb 15 18:25:55 2010 +0000
@@ -0,0 +1,106 @@
+<?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="policymanagement" name="Policy Management" level="generic">
+ <component id="pmdmadapter" filter="s60" name="PM DM Adapter" class="plugin">
+ <unit bldFile="policymanagement/pmdmadapter/group"/>
+ </component>
+ <component id="dmutilserver" filter="s60" name="DM Util Server">
+ <unit bldFile="policymanagement/dmutilserver/group"/>
+ </component>
+ <component id="policyengine" filter="s60" name="Policy Engine">
+ <unit bldFile="policymanagement/policyengine/group"/>
+ </component>
+ <component id="policymanagement_build" filter="s60" name="Policy Management Build">
+ <!-- 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_build" filter="s60" name="SyncML Framework Build">
+ <!-- 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 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/scpdatabase/group"/>
+ <unit bldFile="terminalsecurity/scp/scpserver/group"/>
+ <unit bldFile="terminalsecurity/scp/scppatternplugin/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"/>
+ </component>
+ <component id="terminalsecurity_server" filter="s60" name="Terminal Control Server">
+ <unit bldFile="terminalsecurity/server/group"/>
+ </component>
+ <component id="tcadapter" filter="s60" name="Terminal Control Adapter">
+ <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"/>
+ </component>
+ <component id="diagpluginbase" filter="s60" name="Diagnostics Plugin Base">
+ <unit bldFile="devicediagnosticsfw/diagpluginbase/group"/>
+ </component>
+ <component id="diagresultsdb" filter="s60" name="Diagnostics Results Database">
+ <!-- can only have one unit, merge or split into two components -->
+ <unit bldFile="devicediagnosticsfw/diagresultsdb/client/group"/>
+ <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">
+ <!-- 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"/>
+ </component>
+ </collection>
+ <collection id="remotemgmt_info" name="Remote Management Info" level="specific">
+ <component id="remotemgmt_plat" filter="s60" name="Remote Management Platform Interfaces" class="api">
+ <unit bldFile="remotemgmt_plat/group"/>
+ </component>
+ <component id="remotemgmt_pub" filter="s60" name="Remote Management Public Interfaces" class="api">
+ <unit bldFile="remotemgmt_pub/group"/>
+ </component>
+ </collection>
+ </package>
+</SystemDefinition>
--- a/symbian3/mw/remotestorage/package_definition.xml Fri Feb 12 16:37:22 2010 +0000
+++ b/symbian3/mw/remotestorage/package_definition.xml Mon Feb 15 18:25:55 2010 +0000
@@ -1,109 +1,121 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE SystemDefinition [
- <!ELEMENT SystemDefinition (systemModel?,SystemBuild?)>
- <!ATTLIST SystemDefinition
- name CDATA #REQUIRED
- schema CDATA #REQUIRED>
- <!ELEMENT systemModel (layer+)>
- <!ELEMENT layer (block*|collection*)*>
- <!ATTLIST layer
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED
- levels NMTOKENS #IMPLIED
- span CDATA #IMPLIED>
- <!ELEMENT block (subblock*|collection*)*>
- <!ATTLIST block
- levels NMTOKENS #IMPLIED
- span CDATA #IMPLIED
- level NMTOKEN #IMPLIED
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED>
- <!ELEMENT subblock (collection)*>
- <!ATTLIST subblock
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED>
- <!ELEMENT collection (component)*>
- <!ATTLIST collection
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED
- level NMTOKEN #IMPLIED>
- <!ELEMENT component (unit)*>
- <!ATTLIST component
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED
- deprecated CDATA #IMPLIED
- introduced CDATA #IMPLIED
- contract CDATA #IMPLIED
- plugin (Y|N) 'N'
- filter CDATA #IMPLIED
- class NMTOKENS #IMPLIED
- supports CDATA #IMPLIED
- purpose (optional|mandatory|development) 'optional'>
- <!ELEMENT unit EMPTY>
- <!ATTLIST unit
- mrp CDATA #IMPLIED
- filter CDATA #IMPLIED
- bldFile CDATA #IMPLIED
- root CDATA #IMPLIED
- version NMTOKEN #IMPLIED
- prebuilt NMTOKEN #IMPLIED
- late (Y|N) #IMPLIED
- priority CDATA #IMPLIED>
- <!ELEMENT SystemBuild (option*|target+|targetList+|list+|configuration+)*>
- <!ATTLIST SystemBuild schema CDATA #REQUIRED>
- <!ELEMENT list (ref+)>
- <!ATTLIST list
- name ID #REQUIRED
- description CDATA #REQUIRED>
- <!ELEMENT ref EMPTY>
- <!ATTLIST ref item CDATA #REQUIRED>
- <!ELEMENT targetList EMPTY>
- <!ATTLIST targetList
- name ID #REQUIRED
- description CDATA #REQUIRED
- target IDREFS #REQUIRED>
- <!ELEMENT target EMPTY>
- <!ATTLIST target
- name ID #REQUIRED
- abldTarget CDATA #REQUIRED
- description CDATA #REQUIRED>
- <!ELEMENT option EMPTY>
- <!ATTLIST option
- name ID #REQUIRED
- abldOption CDATA #REQUIRED
- description CDATA #REQUIRED
- enable (Y|N) #REQUIRED>
- <!ELEMENT configuration (listRef+|ref+|task+)*>
- <!ATTLIST configuration
- name ID #REQUIRED
- description CDATA #REQUIRED
- filter CDATA #REQUIRED>
- <!ELEMENT task (listRef*,(buildLayer|specialInstructions))>
- <!ELEMENT listRef EMPTY>
- <!ATTLIST listRef list CDATA #REQUIRED>
- <!ELEMENT buildLayer EMPTY>
- <!ATTLIST buildLayer
- command CDATA #REQUIRED
- targetList IDREFS #IMPLIED
- unitParallel (Y|N) #REQUIRED
- targetParallel (Y|N) 'N'>
- <!ELEMENT specialInstructions EMPTY>
- <!ATTLIST specialInstructions
- name CDATA #REQUIRED
- cwd CDATA #REQUIRED
- root CDATA #IMPLIED
- command CDATA #REQUIRED>
-]>
-<SystemDefinition schema="2.0.1" name="Symbian^3">
-<systemModel>
-<layer name="mw">
-<block name="remotestorage">
-<collection name="s60">
-<component name="remotestorage">
-<unit bldFile="/sf/mw/remotestorage/group" mrp=""/>
-</component>
-</collection>
-</block>
-</layer>
-</systemModel>
+<!DOCTYPE SystemDefinition [
+<!ELEMENT SystemDefinition ( systemModel )>
+<!ATTLIST SystemDefinition
+ name CDATA #REQUIRED
+ schema CDATA #REQUIRED
+>
+<!-- all paths are relative to the environment variable specified by the root attribute, or SOURCEROOT if not. -->
+
+<!-- System Model Section of DTD -->
+<!ELEMENT systemModel (layer+)>
+
+<!ELEMENT layer (block* | collection*)*>
+<!-- Kernel Services, Base Services, OS Services, Etc -->
+<!ATTLIST layer
+ name CDATA #REQUIRED
+ long-name CDATA #IMPLIED
+ levels NMTOKENS #IMPLIED
+ span CDATA #IMPLIED
+>
+
+<!ELEMENT block (subblock* | collection*)*>
+ <!-- Generic OS services, Comms Services, etc -->
+<!ATTLIST block
+ levels NMTOKENS #IMPLIED
+ span CDATA #IMPLIED
+ level NMTOKEN #IMPLIED
+ name CDATA #REQUIRED
+ long-name CDATA #IMPLIED
+>
+
+<!ELEMENT subblock (collection)*>
+<!-- Cellular Baseband Services, Networking Services, etc -->
+<!ATTLIST subblock
+ name CDATA #REQUIRED
+ long-name CDATA #IMPLIED
+>
+
+<!ELEMENT collection (component)*>
+<!-- Screen Driver, Content Handling, etc -->
+<!ATTLIST collection
+ name CDATA #REQUIRED
+ long-name CDATA #IMPLIED
+ level NMTOKEN #IMPLIED
+>
+
+<!ELEMENT component (unit)*>
+<!-- contains units or is a package or prebuilt -->
+<!ATTLIST component
+ name CDATA #REQUIRED
+ long-name CDATA #IMPLIED
+ deprecated CDATA #IMPLIED
+ introduced CDATA #IMPLIED
+ contract CDATA #IMPLIED
+ plugin (Y|N) "N"
+ filter CDATA #IMPLIED
+ class NMTOKENS #IMPLIED
+ supports CDATA #IMPLIED
+ purpose ( optional | mandatory | development ) "optional"
+>
+
+<!ELEMENT unit EMPTY >
+<!-- must be buildable (bld.inf) -->
+<!-- bldFile may someday be removed in favour of mrp -->
+<!ATTLIST unit
+ mrp CDATA #IMPLIED
+ filter CDATA #IMPLIED
+ bldFile CDATA #IMPLIED
+ root CDATA #IMPLIED
+ version NMTOKEN #IMPLIED
+ prebuilt NMTOKEN #IMPLIED
+ late (Y|N) #IMPLIED
+ priority CDATA #IMPLIED
+>
+]>
+<SystemDefinition name="Symbian^3" schema="2.0.1">
+ <systemModel>
+ <layer name="mw" long-name="Middleware" levels="generic specific">
+ <block name="remotestorage" level="generic" long-name="Remote Storage" levels="framework if">
+ <collection name="remotestoragefw" long-name="Remote Storage Framework" level="framework">
+ <component name="mountstore" filter="s60" long-name="RSFW Mount Store">
+ <unit bldFile="/sf/mw/remotestorage/remotestoragefw/mountstore/group"/>
+ </component>
+ <component name="rsfwnotifierplugins" filter="s60" long-name="RSFW Notifier Plugins" plugin="Y">
+ <unit bldFile="/sf/mw/remotestorage/remotestoragefw/rsfwnotifierplugins/group"/>
+ </component>
+ <component name="remotefileengine" filter="s60" long-name="Remote File Engine">
+ <unit bldFile="/sf/mw/remotestorage/remotestoragefw/remotefileengine/group"/>
+ </component>
+ <component name="mountmanager" filter="s60" long-name="RSFW Mount Manager">
+ <unit bldFile="/sf/mw/remotestorage/remotestoragefw/mountmanager/group"/>
+ </component>
+ <component name="webdavaccessplugin" filter="s60" long-name="WebDAV Access Plugin" plugin="Y">
+ <unit bldFile="/sf/mw/remotestorage/remotestoragefw/webdavaccessplugin/group"/>
+ </component>
+ <component name="remotefilesystemplugin" filter="s60" long-name="Remote Filesystem Plugin" plugin="Y">
+ <unit bldFile="/sf/mw/remotestorage/remotestoragefw/remotefilesystemplugin/group"/>
+ </component>
+ <component name="remotestoragegsplugin" filter="s60" long-name="RS GS Plugin" plugin="Y">
+ <!-- uncomment the unit when configuration is in place, it's currently #included from remotestoragefw_build -->
+ <!-- <unit bldFile="remotestoragefw/gsplugin/group"/>-->
+ </component>
+ <component name="remotedriveconfigurationbiocontrol" filter="s60" long-name="Remote Drive Configuration BIO Control">
+ <!-- uncomment the unit when configuration is in place, it's currently #included from remotestoragefw_build -->
+ <!-- <unit bldFile="remotestoragefw/remotedriveconfigurationbiocontrol/group"/>-->
+ </component>
+ <component name="remotestoragefw_build" filter="s60" long-name="Remote Storage Framework Build">
+ <!-- move exports to other components.
+ This is needed for #includes of configured component until congigiration is in place -->
+ <unit bldFile="/sf/mw/remotestorage/remotestoragefw/group"/>
+ </component>
+ </collection>
+ <collection name="remotestorage_info" long-name="Remote Storage Info" level="if">
+ <component name="rsfw_plat" filter="s60" long-name="Remote Storage Platform Interfaces" class="api">
+ <unit bldFile="/sf/mw/remotestorage/rsfw_plat/rsfw_access_protocol_plugin_api/group"/>
+ </component>
+ </collection>
+ </block>
+ </layer>
+ </systemModel>
</SystemDefinition>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/symbian3/mw/remotestorage/package_definition_3.0.xml Mon Feb 15 18:25:55 2010 +0000
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<SystemDefinition schema="3.0.0">
+ <package id="remotestorage" name="Remote Storage" levels="framework if">
+ <collection id="remotestoragefw" name="Remote Storage Framework" level="framework">
+ <component id="mountstore" filter="s60" name="RSFW Mount Store">
+ <unit bldFile="remotestoragefw/mountstore/group"/>
+ </component>
+ <component id="rsfwnotifierplugins" filter="s60" name="RSFW Notifier Plugins" class="plugin">
+ <unit bldFile="remotestoragefw/rsfwnotifierplugins/group"/>
+ </component>
+ <component id="remotefileengine" filter="s60" name="Remote File Engine">
+ <unit bldFile="remotestoragefw/remotefileengine/group"/>
+ </component>
+ <component id="mountmanager" filter="s60" name="RSFW Mount Manager">
+ <unit bldFile="remotestoragefw/mountmanager/group"/>
+ </component>
+ <component id="webdavaccessplugin" filter="s60" name="WebDAV Access Plugin" class="plugin">
+ <unit bldFile="remotestoragefw/webdavaccessplugin/group"/>
+ </component>
+ <component id="remotefilesystemplugin" filter="s60" name="Remote Filesystem Plugin" class="plugin">
+ <unit bldFile="remotestoragefw/remotefilesystemplugin/group"/>
+ </component>
+ <component id="remotestoragegsplugin" filter="s60" name="RS GS Plugin" class="plugin">
+ <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">
+ <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">
+ <!-- move exports to other components.
+ This is needed for #includes of configured component until congigiration is in place -->
+ <unit bldFile="remotestoragefw/group"/>
+ </component>
+ </collection>
+ <collection id="remotestorage_info" name="Remote Storage Info" level="if">
+ <component id="rsfw_plat" filter="s60" class="api" name="Remote Storage Platform Interfaces">
+ <unit bldFile="rsfw_plat/rsfw_access_protocol_plugin_api/group"/>
+ </component>
+ </collection>
+ </package>
+</SystemDefinition>
--- a/symbian3/mw/securitysrv/package_definition.xml Fri Feb 12 16:37:22 2010 +0000
+++ b/symbian3/mw/securitysrv/package_definition.xml Mon Feb 15 18:25:55 2010 +0000
@@ -1,122 +1,210 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE SystemDefinition [
- <!ELEMENT SystemDefinition (systemModel?,SystemBuild?)>
- <!ATTLIST SystemDefinition
- name CDATA #REQUIRED
- schema CDATA #REQUIRED>
- <!ELEMENT systemModel (layer+)>
- <!ELEMENT layer (block*|collection*)*>
- <!ATTLIST layer
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED
- levels NMTOKENS #IMPLIED
- span CDATA #IMPLIED>
- <!ELEMENT block (subblock*|collection*)*>
- <!ATTLIST block
- levels NMTOKENS #IMPLIED
- span CDATA #IMPLIED
- level NMTOKEN #IMPLIED
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED>
- <!ELEMENT subblock (collection)*>
- <!ATTLIST subblock
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED>
- <!ELEMENT collection (component)*>
- <!ATTLIST collection
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED
- level NMTOKEN #IMPLIED>
- <!ELEMENT component (unit)*>
- <!ATTLIST component
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED
- deprecated CDATA #IMPLIED
- introduced CDATA #IMPLIED
- contract CDATA #IMPLIED
- plugin (Y|N) 'N'
- filter CDATA #IMPLIED
- class NMTOKENS #IMPLIED
- supports CDATA #IMPLIED
- purpose (optional|mandatory|development) 'optional'>
- <!ELEMENT unit EMPTY>
- <!ATTLIST unit
- mrp CDATA #IMPLIED
- filter CDATA #IMPLIED
- bldFile CDATA #IMPLIED
- root CDATA #IMPLIED
- version NMTOKEN #IMPLIED
- prebuilt NMTOKEN #IMPLIED
- late (Y|N) #IMPLIED
- priority CDATA #IMPLIED>
- <!ELEMENT SystemBuild (option*|target+|targetList+|list+|configuration+)*>
- <!ATTLIST SystemBuild schema CDATA #REQUIRED>
- <!ELEMENT list (ref+)>
- <!ATTLIST list
- name ID #REQUIRED
- description CDATA #REQUIRED>
- <!ELEMENT ref EMPTY>
- <!ATTLIST ref item CDATA #REQUIRED>
- <!ELEMENT targetList EMPTY>
- <!ATTLIST targetList
- name ID #REQUIRED
- description CDATA #REQUIRED
- target IDREFS #REQUIRED>
- <!ELEMENT target EMPTY>
- <!ATTLIST target
- name ID #REQUIRED
- abldTarget CDATA #REQUIRED
- description CDATA #REQUIRED>
- <!ELEMENT option EMPTY>
- <!ATTLIST option
- name ID #REQUIRED
- abldOption CDATA #REQUIRED
- description CDATA #REQUIRED
- enable (Y|N) #REQUIRED>
- <!ELEMENT configuration (listRef+|ref+|task+)*>
- <!ATTLIST configuration
- name ID #REQUIRED
- description CDATA #REQUIRED
- filter CDATA #REQUIRED>
- <!ELEMENT task (listRef*,(buildLayer|specialInstructions))>
- <!ELEMENT listRef EMPTY>
- <!ATTLIST listRef list CDATA #REQUIRED>
- <!ELEMENT buildLayer EMPTY>
- <!ATTLIST buildLayer
- command CDATA #REQUIRED
- targetList IDREFS #IMPLIED
- unitParallel (Y|N) #REQUIRED
- targetParallel (Y|N) 'N'>
- <!ELEMENT specialInstructions EMPTY>
- <!ATTLIST specialInstructions
- name CDATA #REQUIRED
- cwd CDATA #REQUIRED
- root CDATA #IMPLIED
- command CDATA #REQUIRED>
-]>
-<SystemDefinition schema="2.0.1" name="Symbian^3">
-<systemModel>
-<layer name="mw" long-name="Middleware" levels="generic specific">
-<block name="securitysrv" level="generic" long-name="Security Services" levels="plugin framework server generic specific">
-<collection name="pkiutilities" long-name="PKI Utilities" level="plugin">
-<component name="ocsp" long-name="Online Certificate Status Protocol" introduced="tb91" purpose="optional">
-<unit bldFile="/sf/mw/securitysrv/pkiutilities/ocsp/group" mrp="/sf/mw/securitysrv/pkiutilities/ocsp/group/securitysrv_ocsp.mrp"/>
-</component>
-</collection>
-<collection name="securitysrv_info" long-name="Security Services Info" level="specific">
-<component name="securitysrv_metadata" long-name="Security Services Metadata" introduced="tb91" purpose="development" class="config PC">
-<unit mrp="/sf/mw/securitysrv/securitysrv_info/securitysrv_metadata/securitysrv_metadata.mrp"/>
-</component>
-</collection>
-<collection name="s60">
-<component name="sedo_securitysrv_pkiutilities_Certificates">
-<unit bldFile="/sf/mw/securitysrv/pkiutilities/Certificates/group" mrp=""/>
-</component>
-<component name="securitysrv">
-<unit bldFile="/sf/mw/securitysrv/group" mrp=""/>
-</component>
-</collection>
-</block>
-</layer>
-</systemModel>
-</SystemDefinition>
\ No newline at end of file
+<!DOCTYPE SystemDefinition [
+<!ELEMENT SystemDefinition ( systemModel )>
+<!ATTLIST SystemDefinition
+ name CDATA #REQUIRED
+ schema CDATA #REQUIRED
+>
+<!-- all paths are relative to the environment variable specified by the root attribute, or SOURCEROOT if not. -->
+
+<!-- System Model Section of DTD -->
+<!ELEMENT systemModel (layer+)>
+
+<!ELEMENT layer (block* | collection*)*>
+<!-- Kernel Services, Base Services, OS Services, Etc -->
+<!ATTLIST layer
+ name CDATA #REQUIRED
+ long-name CDATA #IMPLIED
+ levels NMTOKENS #IMPLIED
+ span CDATA #IMPLIED
+>
+
+<!ELEMENT block (subblock* | collection*)*>
+ <!-- Generic OS services, Comms Services, etc -->
+<!ATTLIST block
+ levels NMTOKENS #IMPLIED
+ span CDATA #IMPLIED
+ level NMTOKEN #IMPLIED
+ name CDATA #REQUIRED
+ long-name CDATA #IMPLIED
+>
+
+<!ELEMENT subblock (collection)*>
+<!-- Cellular Baseband Services, Networking Services, etc -->
+<!ATTLIST subblock
+ name CDATA #REQUIRED
+ long-name CDATA #IMPLIED
+>
+
+<!ELEMENT collection (component)*>
+<!-- Screen Driver, Content Handling, etc -->
+<!ATTLIST collection
+ name CDATA #REQUIRED
+ long-name CDATA #IMPLIED
+ level NMTOKEN #IMPLIED
+>
+
+<!ELEMENT component (unit)*>
+<!-- contains units or is a package or prebuilt -->
+<!ATTLIST component
+ name CDATA #REQUIRED
+ long-name CDATA #IMPLIED
+ deprecated CDATA #IMPLIED
+ introduced CDATA #IMPLIED
+ contract CDATA #IMPLIED
+ plugin (Y|N) "N"
+ filter CDATA #IMPLIED
+ class NMTOKENS #IMPLIED
+ supports CDATA #IMPLIED
+ purpose ( optional | mandatory | development ) "optional"
+>
+
+<!ELEMENT unit EMPTY >
+<!-- must be buildable (bld.inf) -->
+<!-- bldFile may someday be removed in favour of mrp -->
+<!ATTLIST unit
+ mrp CDATA #IMPLIED
+ filter CDATA #IMPLIED
+ bldFile CDATA #IMPLIED
+ root CDATA #IMPLIED
+ version NMTOKEN #IMPLIED
+ prebuilt NMTOKEN #IMPLIED
+ late (Y|N) #IMPLIED
+ priority CDATA #IMPLIED
+>
+]>
+<SystemDefinition name="Symbian^3" schema="2.0.1">
+ <systemModel>
+ <layer name="mw" long-name="Middleware" levels="generic specific">
+ <block name="securitysrv" level="generic" long-name="Security Services" levels="plugin framework server generic specific">
+ <collection name="cms" long-name="Certificate Management Service" level="server">
+ <!-- collection is really a component. Need to move down a directory-->
+ <component name="cms_build" filter="s60" long-name="CMS" introduced="^3">
+ <unit bldFile="/sf/mw/securitysrv/cms/group"/>
+ </component>
+ </collection>
+ <collection name="pkiutilities" long-name="PKI Utilities" level="plugin">
+ <component name="x509certnameparser" filter="s60" long-name="X.509 Certificate Name Parser">
+ <unit bldFile="/sf/mw/securitysrv/pkiutilities/x509certnameparser/group"/>
+ </component>
+ <component name="pkcs12" filter="s60" long-name="PKCS #12">
+ <unit bldFile="/sf/mw/securitysrv/pkiutilities/pkcs12/group"/>
+ </component>
+ <component name="certmanui" filter="s60" long-name="Certificate Management UI">
+ <unit bldFile="/sf/mw/securitysrv/pkiutilities/certmanui/group"/>
+ </component>
+ <component name="ctsecuritydialogs" filter="s60" long-name="Crypto Token Security Dialogs">
+ <unit bldFile="/sf/mw/securitysrv/pkiutilities/ctsecuritydialogs/group"/>
+ </component>
+ <component name="certsaver" filter="s60" long-name="Certificate Saver">
+ <unit bldFile="/sf/mw/securitysrv/pkiutilities/certsaver/group"/>
+ </component>
+ <component name="secmodui" filter="s60" long-name="Security Module UI">
+ <unit bldFile="/sf/mw/securitysrv/pkiutilities/secmodui/group"/>
+ </component>
+ <component name="devicetoken" filter="s60" long-name="Device Token">
+ <unit bldFile="/sf/mw/securitysrv/pkiutilities/devicetoken/group"/>
+ </component>
+ <component name="certificates" filter="s60" long-name="Certificates">
+ <unit bldFile="/sf/mw/securitysrv/pkiutilities/certificates/group" filter="sf_build"/>
+ </component>
+ <component name="pkiutilities_build" filter="s60" long-name="PKI Utilities Build">
+ <!-- need to split this into the above components -->
+ <unit bldFile="/sf/mw/securitysrv/pkiutilities/group"/>
+ </component>
+ <component name="ocsp" long-name="Online Certificate Status Protocol" introduced="^2" purpose="optional">
+ <unit bldFile="/sf/mw/securitysrv/pkiutilities/ocsp/group" mrp="/sf/mw/securitysrv/pkiutilities/ocsp/group/securitysrv_ocsp.mrp"/>
+ </component>
+ </collection>
+ <collection name="wim" long-name="Wireless Identity Module " level="framework">
+ <!-- collection is really a component. Need to move down a directory-->
+ <component name="wim_build" filter="s60" long-name="WIM Build">
+ <unit bldFile="/sf/mw/securitysrv/wim/group"/>
+ </component>
+ </collection>
+ <collection name="remotelock" long-name="Remote Lock" level="generic">
+ <!-- collection is really a component. Need to move down a directory-->
+ <component name="remotelock_build" filter="s60" long-name="Remote Lock Build">
+ <unit bldFile="/sf/mw/securitysrv/remotelock/group"/>
+ </component>
+ </collection>
+ <collection name="securitydialogs" long-name="Security Dialogs" level="specific">
+ <component name="keylockpolicyapi" filter="s60" long-name="Keylock Policy API">
+ <unit bldFile="/sf/mw/securitysrv/securitydialogs/keylockpolicyapi/group"/>
+ </component>
+ <component name="autolock" long-name="Autolock" filter="s60">
+ <unit bldFile="/sf/mw/securitysrv/securitydialogs/autolock/group"/>
+ </component>
+ <component name="secui" filter="s60" long-name="Security UI">
+ <unit bldFile="/sf/mw/securitysrv/securitydialogs/secui/group"/>
+ </component>
+ <component name="securitynotifier" filter="s60" long-name="Security Notifier">
+ <unit bldFile="/sf/mw/securitysrv/securitydialogs/securitynotifier/group"/>
+ </component>
+ <component name="lockclient" filter="s60" long-name="Lock Client" introduced="^3">
+ <unit bldFile="/sf/mw/securitysrv/securitydialogs/lockclient/group"/>
+ </component>
+ <component name="lockapp" filter="s60" long-name="Lock Application" introduced="^3">
+ <unit bldFile="/sf/mw/securitysrv/securitydialogs/lockapp/group"/>
+ </component>
+ <component name="simlockui" filter="s60" long-name="SIM Lock UI" introduced="^3">
+ <unit bldFile="/sf/mw/securitysrv/securitydialogs/simlockui/group"/>
+ </component>
+ </collection>
+ <collection name="boottimeintegritycheck" long-name="Boot Time Integrity Check" level="plugin">
+ <!-- collection is really a component. Need to move down a directory-->
+ <component name="boottimeintegritycheck_build" filter="s60" long-name="Boot Time Integrity Check Build">
+ <unit bldFile="/sf/mw/securitysrv/boottimeintegritycheck/group"/>
+ </component>
+ </collection>
+ <collection name="gba" long-name="Generic Bootstrapping Architecture" level="server">
+ <component name="uicc" filter="s60" long-name="UICC" introduced="^2" plugin="Y">
+ <unit bldFile="/sf/mw/securitysrv/gba/uicc/group"/>
+ </component>
+ <component name="gbaserver" filter="s60" long-name="GBA Server" introduced="^2">
+ <unit bldFile="/sf/mw/securitysrv/gba/gbaserver/group"/>
+ </component>
+ <component name="gbaapi" filter="s60" long-name="GBA API" introduced="^2">
+ <unit bldFile="/sf/mw/securitysrv/gba/gbaapi/group"/>
+ </component>
+ <component name="gbafilter" filter="s60" long-name="GBA HTTP Filter" introduced="^2" plugin="Y">
+ <unit bldFile="/sf/mw/securitysrv/gba/gbafilter/group"/>
+ </component>
+ <component name="gba_build" filter="s60" long-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="/sf/mw/securitysrv/gba/group"/>
+ </component>
+ </collection>
+ <collection name="devencdiskutils" long-name="Device Encryption Disk Utils" level="server">
+ <component name="devenccommonutils" filter="s60" long-name="Device Encryption Common Utils" introduced="^3">
+ <unit bldFile="/sf/mw/securitysrv/devencdiskutils/DevEncCommonUtils/group"/>
+ </component>
+ <component name="devencrfsplugin" filter="s60" long-name="Device Encryption RFS Plugin" introduced="^3" plugin="Y">
+ <unit bldFile="/sf/mw/securitysrv/devencdiskutils/DevEncRfsPlugin/group"/>
+ </component>
+ <component name="pk5recognizer" filter="s60" long-name="Device Encryption Pk5 Recognizer" introduced="^3" plugin="Y">
+ <unit bldFile="/sf/mw/securitysrv/devencdiskutils/Pk5Recognizer/group"/>
+ </component>
+ <component name="devencstarter" filter="s60" long-name="Device Encryption Starter" introduced="^3" plugin="Y">
+ <unit bldFile="/sf/mw/securitysrv/devencdiskutils/DevEncStarter/group"/>
+ </component>
+ <component name="devencdiskutils" filter="s60" long-name="Device Encryption Disk Utils Build" introduced="^3">
+ <!-- need to split this into the above components, or remove #includes and make this a ROM component-->
+ <unit bldFile="/sf/mw/securitysrv/devencdiskutils/group"/>
+ </component>
+ </collection>
+ <collection name="securitysrv_info" long-name="Security Services Info" level="specific">
+ <component name="secsrv_plat" long-name="Security Services Platform Interfaces" filter="s60" class="api">
+ <unit bldFile="/sf/mw/securitysrv/secsrv_plat/group"/>
+ </component>
+ <component name="securitysrv_test" filter="s60,api_test" purpose="development" long-name="Security Services Test">
+ <unit bldFile="/sf/mw/securitysrv/tsrc/group"/>
+ </component>
+ <component name="securitysrv_metadata" long-name="Security Services Metadata" introduced="^2" purpose="development" class="config PC">
+ <unit mrp="/sf/mw/securitysrv/securitysrv_info/securitysrv_metadata/securitysrv_metadata.mrp"/>
+ </component>
+ </collection>
+ </block>
+ </layer>
+ </systemModel>
+</SystemDefinition>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/symbian3/mw/securitysrv/package_definition_3.0.xml Mon Feb 15 18:25:55 2010 +0000
@@ -0,0 +1,132 @@
+<?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="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">
+ <component id="x509certnameparser" filter="s60" name="X.509 Certificate Name Parser">
+ <unit bldFile="pkiutilities/x509certnameparser/group"/>
+ </component>
+ <component id="pkcs12" filter="s60" name="PKCS #12">
+ <unit bldFile="pkiutilities/pkcs12/group"/>
+ </component>
+ <component id="certmanui" filter="s60" name="Certificate Management UI">
+ <unit bldFile="pkiutilities/certmanui/group"/>
+ </component>
+ <component id="ctsecuritydialogs" filter="s60" name="Crypto Token Security Dialogs">
+ <unit bldFile="pkiutilities/ctsecuritydialogs/group"/>
+ </component>
+ <component id="certsaver" filter="s60" name="Certificate Saver">
+ <unit bldFile="pkiutilities/certsaver/group"/>
+ </component>
+ <component id="secmodui" filter="s60" name="Security Module UI">
+ <unit bldFile="pkiutilities/secmodui/group"/>
+ </component>
+ <component id="devicetoken" filter="s60" name="Device Token">
+ <unit bldFile="pkiutilities/devicetoken/group"/>
+ </component>
+ <component id="certificates" filter="s60" name="Certificates">
+ <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="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="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">
+ <component id="keylockpolicyapi" filter="s60" name="Keylock Policy API">
+ <unit bldFile="securitydialogs/keylockpolicyapi/group"/>
+ </component>
+ <component id="autolock" name="Autolock" filter="s60">
+ <unit bldFile="securitydialogs/autolock/group"/>
+ </component>
+ <component id="secui" filter="s60" name="Security UI">
+ <unit bldFile="securitydialogs/secui/group"/>
+ </component>
+ <component id="securitynotifier" filter="s60" name="Security Notifier">
+ <unit bldFile="securitydialogs/securitynotifier/group"/>
+ </component>
+ <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"/>
+ </component>
+ <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"/>
+ </component>
+ </collection>
+ </package>
+</SystemDefinition>
--- a/symbian3/mw/serviceapi/package_definition.xml Fri Feb 12 16:37:22 2010 +0000
+++ b/symbian3/mw/serviceapi/package_definition.xml Mon Feb 15 18:25:55 2010 +0000
@@ -1,109 +1,126 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE SystemDefinition [
- <!ELEMENT SystemDefinition (systemModel?,SystemBuild?)>
- <!ATTLIST SystemDefinition
- name CDATA #REQUIRED
- schema CDATA #REQUIRED>
- <!ELEMENT systemModel (layer+)>
- <!ELEMENT layer (block*|collection*)*>
- <!ATTLIST layer
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED
- levels NMTOKENS #IMPLIED
- span CDATA #IMPLIED>
- <!ELEMENT block (subblock*|collection*)*>
- <!ATTLIST block
- levels NMTOKENS #IMPLIED
- span CDATA #IMPLIED
- level NMTOKEN #IMPLIED
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED>
- <!ELEMENT subblock (collection)*>
- <!ATTLIST subblock
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED>
- <!ELEMENT collection (component)*>
- <!ATTLIST collection
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED
- level NMTOKEN #IMPLIED>
- <!ELEMENT component (unit)*>
- <!ATTLIST component
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED
- deprecated CDATA #IMPLIED
- introduced CDATA #IMPLIED
- contract CDATA #IMPLIED
- plugin (Y|N) 'N'
- filter CDATA #IMPLIED
- class NMTOKENS #IMPLIED
- supports CDATA #IMPLIED
- purpose (optional|mandatory|development) 'optional'>
- <!ELEMENT unit EMPTY>
- <!ATTLIST unit
- mrp CDATA #IMPLIED
- filter CDATA #IMPLIED
- bldFile CDATA #IMPLIED
- root CDATA #IMPLIED
- version NMTOKEN #IMPLIED
- prebuilt NMTOKEN #IMPLIED
- late (Y|N) #IMPLIED
- priority CDATA #IMPLIED>
- <!ELEMENT SystemBuild (option*|target+|targetList+|list+|configuration+)*>
- <!ATTLIST SystemBuild schema CDATA #REQUIRED>
- <!ELEMENT list (ref+)>
- <!ATTLIST list
- name ID #REQUIRED
- description CDATA #REQUIRED>
- <!ELEMENT ref EMPTY>
- <!ATTLIST ref item CDATA #REQUIRED>
- <!ELEMENT targetList EMPTY>
- <!ATTLIST targetList
- name ID #REQUIRED
- description CDATA #REQUIRED
- target IDREFS #REQUIRED>
- <!ELEMENT target EMPTY>
- <!ATTLIST target
- name ID #REQUIRED
- abldTarget CDATA #REQUIRED
- description CDATA #REQUIRED>
- <!ELEMENT option EMPTY>
- <!ATTLIST option
- name ID #REQUIRED
- abldOption CDATA #REQUIRED
- description CDATA #REQUIRED
- enable (Y|N) #REQUIRED>
- <!ELEMENT configuration (listRef+|ref+|task+)*>
- <!ATTLIST configuration
- name ID #REQUIRED
- description CDATA #REQUIRED
- filter CDATA #REQUIRED>
- <!ELEMENT task (listRef*,(buildLayer|specialInstructions))>
- <!ELEMENT listRef EMPTY>
- <!ATTLIST listRef list CDATA #REQUIRED>
- <!ELEMENT buildLayer EMPTY>
- <!ATTLIST buildLayer
- command CDATA #REQUIRED
- targetList IDREFS #IMPLIED
- unitParallel (Y|N) #REQUIRED
- targetParallel (Y|N) 'N'>
- <!ELEMENT specialInstructions EMPTY>
- <!ATTLIST specialInstructions
- name CDATA #REQUIRED
- cwd CDATA #REQUIRED
- root CDATA #IMPLIED
- command CDATA #REQUIRED>
-]>
-<SystemDefinition schema="2.0.1" name="Symbian^3">
-<systemModel>
-<layer name="mw">
-<block name="serviceapi">
-<collection name="s60">
-<component name="serviceapi">
-<unit bldFile="/sf/mw/serviceapi/group" mrp=""/>
-</component>
-</collection>
-</block>
-</layer>
-</systemModel>
+<!DOCTYPE SystemDefinition [
+<!ELEMENT SystemDefinition ( systemModel )>
+<!ATTLIST SystemDefinition
+ name CDATA #REQUIRED
+ schema CDATA #REQUIRED
+>
+<!-- all paths are relative to the environment variable specified by the root attribute, or SOURCEROOT if not. -->
+
+<!-- System Model Section of DTD -->
+<!ELEMENT systemModel (layer+)>
+
+<!ELEMENT layer (block* | collection*)*>
+<!-- Kernel Services, Base Services, OS Services, Etc -->
+<!ATTLIST layer
+ name CDATA #REQUIRED
+ long-name CDATA #IMPLIED
+ levels NMTOKENS #IMPLIED
+ span CDATA #IMPLIED
+>
+
+<!ELEMENT block (subblock* | collection*)*>
+ <!-- Generic OS services, Comms Services, etc -->
+<!ATTLIST block
+ levels NMTOKENS #IMPLIED
+ span CDATA #IMPLIED
+ level NMTOKEN #IMPLIED
+ name CDATA #REQUIRED
+ long-name CDATA #IMPLIED
+>
+
+<!ELEMENT subblock (collection)*>
+<!-- Cellular Baseband Services, Networking Services, etc -->
+<!ATTLIST subblock
+ name CDATA #REQUIRED
+ long-name CDATA #IMPLIED
+>
+
+<!ELEMENT collection (component)*>
+<!-- Screen Driver, Content Handling, etc -->
+<!ATTLIST collection
+ name CDATA #REQUIRED
+ long-name CDATA #IMPLIED
+ level NMTOKEN #IMPLIED
+>
+
+<!ELEMENT component (unit)*>
+<!-- contains units or is a package or prebuilt -->
+<!ATTLIST component
+ name CDATA #REQUIRED
+ long-name CDATA #IMPLIED
+ deprecated CDATA #IMPLIED
+ introduced CDATA #IMPLIED
+ contract CDATA #IMPLIED
+ plugin (Y|N) "N"
+ filter CDATA #IMPLIED
+ class NMTOKENS #IMPLIED
+ supports CDATA #IMPLIED
+ purpose ( optional | mandatory | development ) "optional"
+>
+
+<!ELEMENT unit EMPTY >
+<!-- must be buildable (bld.inf) -->
+<!-- bldFile may someday be removed in favour of mrp -->
+<!ATTLIST unit
+ mrp CDATA #IMPLIED
+ filter CDATA #IMPLIED
+ bldFile CDATA #IMPLIED
+ root CDATA #IMPLIED
+ version NMTOKEN #IMPLIED
+ prebuilt NMTOKEN #IMPLIED
+ late (Y|N) #IMPLIED
+ priority CDATA #IMPLIED
+>
+]>
+<SystemDefinition name="Symbian^3" schema="2.0.1">
+ <systemModel>
+ <layer name="mw" long-name="Middleware" levels="generic specific">
+ <block name="serviceapi" level="specific" long-name="Service API" levels="os mw1 mw2 app">
+ <!-- should break up this collection into something meaningful -->
+ <collection name="serviceproviders" long-name="Service Providers" level="mw1">
+ <component name="sapi_contacts_vpbk" long-name="Contacts Phonebook SAPI" filter="s60" plugin="Y">
+ <unit bldFile="/sf/mw/serviceapi/serviceproviders/sapi_contacts_vpbk/group"/>
+ </component>
+ <component name="sapi_location" long-name="Location SAPI" filter="s60" plugin="Y">
+ <unit bldFile="/sf/mw/serviceapi/serviceproviders/sapi_location/group"/>
+ </component>
+ <component name="sapi_mediamanagement" long-name="Media Management SAPI" filter="s60" plugin="Y">
+ <unit bldFile="/sf/mw/serviceapi/serviceproviders/sapi_mediamanagement/group"/>
+ </component>
+ <component name="sapi_landmarks" long-name="Landmarks SAPI" filter="s60" plugin="Y">
+ <unit bldFile="/sf/mw/serviceapi/serviceproviders/sapi_landmarks/group"/>
+ </component>
+ <component name="sapi_messaging" long-name="Messaging SAPI" filter="s60" plugin="Y">
+ <unit bldFile="/sf/mw/serviceapi/serviceproviders/sapi_messaging/group"/>
+ </component>
+ <component name="sapi_applicationmanager" long-name="Application Manager SAPI" filter="s60" plugin="Y">
+ <unit bldFile="/sf/mw/serviceapi/serviceproviders/sapi_applicationmanager/group"/>
+ </component>
+ <component name="sapi_calendar" long-name="Calendar SAPI" filter="s60" plugin="Y">
+ <unit bldFile="/sf/mw/serviceapi/serviceproviders/sapi_calendar/group"/>
+ </component>
+ <component name="sapi_logging" long-name="Logging SAPI" filter="s60" plugin="Y">
+ <unit bldFile="/sf/mw/serviceapi/serviceproviders/sapi_logging/group"/>
+ </component>
+ <component name="sapi_sensor" long-name="Sensor SAPI" filter="s60" plugin="Y">
+ <unit bldFile="/sf/mw/serviceapi/serviceproviders/sapi_sensor/group"/>
+ </component>
+ <component name="sapi_sysinfo" long-name="Sysinfo SAPI" filter="s60" plugin="Y">
+ <unit bldFile="/sf/mw/serviceapi/serviceproviders/sapi_sysinfo/group"/>
+ </component>
+ <component name="sapi_serviceregistry" long-name="Service Registry SAPI" filter="s60" plugin="Y">
+ <unit bldFile="/sf/mw/serviceapi/serviceproviders/sapi_serviceregistry/group"/>
+ </component>
+ <component name="jsapi" long-name="Javascript API" filter="s60" plugin="Y">
+ <unit bldFile="/sf/mw/serviceapi/serviceproviders/jsapi/group"/>
+ </component>
+ <component name="serviceproviders_build" filter="s60" long-name="Service API Build">
+ <!-- distribute the exports or make this a ROM component by removing the #includes -->
+ <unit bldFile="/sf/mw/serviceapi/serviceproviders/group"/>
+ </component>
+ </collection>
+ </block>
+ </layer>
+ </systemModel>
</SystemDefinition>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/symbian3/mw/serviceapi/package_definition_3.0.xml Mon Feb 15 18:25:55 2010 +0000
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<SystemDefinition schema="3.0.0">
+ <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_contacts_vpbk" name="Contacts Phonebook SAPI" filter="s60" class="plugin">
+ <unit bldFile="serviceproviders/sapi_contacts_vpbk/group"/>
+ </component>
+ <component id="sapi_location" name="Location SAPI" filter="s60" class="plugin">
+ <unit bldFile="serviceproviders/sapi_location/group"/>
+ </component>
+ <component id="sapi_mediamanagement" name="Media Management SAPI" filter="s60" class="plugin">
+ <unit bldFile="serviceproviders/sapi_mediamanagement/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"/>
+ </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"/>
+ </component>
+ <component id="sapi_sysinfo" name="Sysinfo SAPI" filter="s60" class="plugin">
+ <unit bldFile="serviceproviders/sapi_sysinfo/group"/>
+ </component>
+ <component id="sapi_serviceregistry" name="Service Registry SAPI" filter="s60" class="plugin">
+ <unit bldFile="serviceproviders/sapi_serviceregistry/group"/>
+ </component>
+ <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">
+ <!-- distribute the exports or make this a ROM component by removing the #includes -->
+ <unit bldFile="serviceproviders/group"/>
+ </component>
+ </collection>
+ </package>
+</SystemDefinition>
--- a/symbian3/mw/serviceapifw/package_definition.xml Fri Feb 12 16:37:22 2010 +0000
+++ b/symbian3/mw/serviceapifw/package_definition.xml Mon Feb 15 18:25:55 2010 +0000
@@ -1,109 +1,111 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE SystemDefinition [
- <!ELEMENT SystemDefinition (systemModel?,SystemBuild?)>
- <!ATTLIST SystemDefinition
- name CDATA #REQUIRED
- schema CDATA #REQUIRED>
- <!ELEMENT systemModel (layer+)>
- <!ELEMENT layer (block*|collection*)*>
- <!ATTLIST layer
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED
- levels NMTOKENS #IMPLIED
- span CDATA #IMPLIED>
- <!ELEMENT block (subblock*|collection*)*>
- <!ATTLIST block
- levels NMTOKENS #IMPLIED
- span CDATA #IMPLIED
- level NMTOKEN #IMPLIED
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED>
- <!ELEMENT subblock (collection)*>
- <!ATTLIST subblock
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED>
- <!ELEMENT collection (component)*>
- <!ATTLIST collection
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED
- level NMTOKEN #IMPLIED>
- <!ELEMENT component (unit)*>
- <!ATTLIST component
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED
- deprecated CDATA #IMPLIED
- introduced CDATA #IMPLIED
- contract CDATA #IMPLIED
- plugin (Y|N) 'N'
- filter CDATA #IMPLIED
- class NMTOKENS #IMPLIED
- supports CDATA #IMPLIED
- purpose (optional|mandatory|development) 'optional'>
- <!ELEMENT unit EMPTY>
- <!ATTLIST unit
- mrp CDATA #IMPLIED
- filter CDATA #IMPLIED
- bldFile CDATA #IMPLIED
- root CDATA #IMPLIED
- version NMTOKEN #IMPLIED
- prebuilt NMTOKEN #IMPLIED
- late (Y|N) #IMPLIED
- priority CDATA #IMPLIED>
- <!ELEMENT SystemBuild (option*|target+|targetList+|list+|configuration+)*>
- <!ATTLIST SystemBuild schema CDATA #REQUIRED>
- <!ELEMENT list (ref+)>
- <!ATTLIST list
- name ID #REQUIRED
- description CDATA #REQUIRED>
- <!ELEMENT ref EMPTY>
- <!ATTLIST ref item CDATA #REQUIRED>
- <!ELEMENT targetList EMPTY>
- <!ATTLIST targetList
- name ID #REQUIRED
- description CDATA #REQUIRED
- target IDREFS #REQUIRED>
- <!ELEMENT target EMPTY>
- <!ATTLIST target
- name ID #REQUIRED
- abldTarget CDATA #REQUIRED
- description CDATA #REQUIRED>
- <!ELEMENT option EMPTY>
- <!ATTLIST option
- name ID #REQUIRED
- abldOption CDATA #REQUIRED
- description CDATA #REQUIRED
- enable (Y|N) #REQUIRED>
- <!ELEMENT configuration (listRef+|ref+|task+)*>
- <!ATTLIST configuration
- name ID #REQUIRED
- description CDATA #REQUIRED
- filter CDATA #REQUIRED>
- <!ELEMENT task (listRef*,(buildLayer|specialInstructions))>
- <!ELEMENT listRef EMPTY>
- <!ATTLIST listRef list CDATA #REQUIRED>
- <!ELEMENT buildLayer EMPTY>
- <!ATTLIST buildLayer
- command CDATA #REQUIRED
- targetList IDREFS #IMPLIED
- unitParallel (Y|N) #REQUIRED
- targetParallel (Y|N) 'N'>
- <!ELEMENT specialInstructions EMPTY>
- <!ATTLIST specialInstructions
- name CDATA #REQUIRED
- cwd CDATA #REQUIRED
- root CDATA #IMPLIED
- command CDATA #REQUIRED>
-]>
-<SystemDefinition schema="2.0.1" name="Symbian^3">
-<systemModel>
-<layer name="mw">
-<block name="serviceapifw">
-<collection name="s60">
-<component name="serviceapifw">
-<unit bldFile="/sf/mw/serviceapifw/group" mrp=""/>
-</component>
-</collection>
-</block>
-</layer>
-</systemModel>
+<!DOCTYPE SystemDefinition [
+<!ELEMENT SystemDefinition ( systemModel )>
+<!ATTLIST SystemDefinition
+ name CDATA #REQUIRED
+ schema CDATA #REQUIRED
+>
+<!-- all paths are relative to the environment variable specified by the root attribute, or SOURCEROOT if not. -->
+
+<!-- System Model Section of DTD -->
+<!ELEMENT systemModel (layer+)>
+
+<!ELEMENT layer (block* | collection*)*>
+<!-- Kernel Services, Base Services, OS Services, Etc -->
+<!ATTLIST layer
+ name CDATA #REQUIRED
+ long-name CDATA #IMPLIED
+ levels NMTOKENS #IMPLIED
+ span CDATA #IMPLIED
+>
+
+<!ELEMENT block (subblock* | collection*)*>
+ <!-- Generic OS services, Comms Services, etc -->
+<!ATTLIST block
+ levels NMTOKENS #IMPLIED
+ span CDATA #IMPLIED
+ level NMTOKEN #IMPLIED
+ name CDATA #REQUIRED
+ long-name CDATA #IMPLIED
+>
+
+<!ELEMENT subblock (collection)*>
+<!-- Cellular Baseband Services, Networking Services, etc -->
+<!ATTLIST subblock
+ name CDATA #REQUIRED
+ long-name CDATA #IMPLIED
+>
+
+<!ELEMENT collection (component)*>
+<!-- Screen Driver, Content Handling, etc -->
+<!ATTLIST collection
+ name CDATA #REQUIRED
+ long-name CDATA #IMPLIED
+ level NMTOKEN #IMPLIED
+>
+
+<!ELEMENT component (unit)*>
+<!-- contains units or is a package or prebuilt -->
+<!ATTLIST component
+ name CDATA #REQUIRED
+ long-name CDATA #IMPLIED
+ deprecated CDATA #IMPLIED
+ introduced CDATA #IMPLIED
+ contract CDATA #IMPLIED
+ plugin (Y|N) "N"
+ filter CDATA #IMPLIED
+ class NMTOKENS #IMPLIED
+ supports CDATA #IMPLIED
+ purpose ( optional | mandatory | development ) "optional"
+>
+
+<!ELEMENT unit EMPTY >
+<!-- must be buildable (bld.inf) -->
+<!-- bldFile may someday be removed in favour of mrp -->
+<!ATTLIST unit
+ mrp CDATA #IMPLIED
+ filter CDATA #IMPLIED
+ bldFile CDATA #IMPLIED
+ root CDATA #IMPLIED
+ version NMTOKEN #IMPLIED
+ prebuilt NMTOKEN #IMPLIED
+ late (Y|N) #IMPLIED
+ priority CDATA #IMPLIED
+>
+]>
+<SystemDefinition name="Symbian^3" schema="2.0.1">
+ <systemModel>
+ <layer name="mw" long-name="Middleware" levels="generic specific">
+ <block name="serviceapifw" level="specific" long-name="Service API Framework" levels="plugin framework server generic specific">
+ <collection name="rtsecuritymanager" long-name="Runtime Security Manager" level="server">
+ <component name="rtsecuritymanagerutil" filter="s60" long-name="Runtime Security Manager Util">
+ <unit bldFile="/sf/mw/serviceapifw/rtsecuritymanager/rtsecuritymanagerutil/group"/>
+ </component>
+ <component name="rtsecuritymanagerserver" filter="s60" long-name="Runtime Security Manager Server">
+ <unit bldFile="/sf/mw/serviceapifw/rtsecuritymanager/rtsecuritymanagerserver/group"/>
+ </component>
+ <component name="rtsecuritymanagerclient" filter="s60" long-name="Runtime Security Manager Client">
+ <unit bldFile="/sf/mw/serviceapifw/rtsecuritymanager/rtsecuritymanagerclient/group"/>
+ </component>
+ <component name="rtsecuritymanager_build" filter="s60" long-name="Runtime Security Manager Build">
+ <!-- Move the export to the appropriate components, or make this a ROM component by removing the #includes -->
+ <unit bldFile="/sf/mw/serviceapifw/rtsecuritymanager/group"/>
+ </component>
+ </collection>
+ <collection name="languageinterworkingfw" long-name="Language Interworking Framework" level="framework">
+ <component name="lifwservicehandler" filter="s60" long-name="Service Handler">
+ <unit bldFile="/sf/mw/serviceapifw/languageinterworkingfw/servicehandler/group"/>
+ </component>
+ </collection>
+ <collection name="serviceapifw_info" long-name="Service API Framework Info" level="specific">
+ <component name="serviceapifw_plat" filter="s60" long-name="Service API Framework Platform Interfaces" class="api">
+ <unit bldFile="/sf/mw/serviceapifw/serviceapifw_plat/group"/>
+ </component>
+ <component name="serviceapifw_pub" filter="s60" long-name="Service API Framework Public Interfaces" class="api">
+ <unit bldFile="/sf/mw/serviceapifw/serviceapifw_pub/group"/>
+ </component>
+ </collection>
+ </block>
+ </layer>
+ </systemModel>
</SystemDefinition>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/symbian3/mw/serviceapifw/package_definition_3.0.xml Mon Feb 15 18:25:55 2010 +0000
@@ -0,0 +1,33 @@
+<?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="rtsecuritymanager" name="Runtime Security Manager" level="server">
+ <component id="rtsecuritymanagerutil" filter="s60" name="Runtime Security Manager Util">
+ <unit bldFile="rtsecuritymanager/rtsecuritymanagerutil/group"/>
+ </component>
+ <component id="rtsecuritymanagerserver" filter="s60" name="Runtime Security Manager Server">
+ <unit bldFile="rtsecuritymanager/rtsecuritymanagerserver/group"/>
+ </component>
+ <component id="rtsecuritymanagerclient" filter="s60" name="Runtime Security Manager Client">
+ <unit bldFile="rtsecuritymanager/rtsecuritymanagerclient/group"/>
+ </component>
+ <component id="rtsecuritymanager_build" filter="s60" name="Runtime Security Manager Build">
+ <!-- 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_plat" filter="s60" name="Service API Framework Platform Interfaces" class="api">
+ <unit bldFile="serviceapifw_plat/group"/>
+ </component>
+ <component id="serviceapifw_pub" filter="s60" name="Service API Framework Public Interfaces" class="api">
+ <unit bldFile="serviceapifw_pub/group"/>
+ </component>
+ </collection>
+ </package>
+</SystemDefinition>
--- a/symbian3/mw/shortlinkconn/package_definition.xml Fri Feb 12 16:37:22 2010 +0000
+++ b/symbian3/mw/shortlinkconn/package_definition.xml Mon Feb 15 18:25:55 2010 +0000
@@ -1,109 +1,124 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE SystemDefinition [
- <!ELEMENT SystemDefinition (systemModel?,SystemBuild?)>
- <!ATTLIST SystemDefinition
- name CDATA #REQUIRED
- schema CDATA #REQUIRED>
- <!ELEMENT systemModel (layer+)>
- <!ELEMENT layer (block*|collection*)*>
- <!ATTLIST layer
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED
- levels NMTOKENS #IMPLIED
- span CDATA #IMPLIED>
- <!ELEMENT block (subblock*|collection*)*>
- <!ATTLIST block
- levels NMTOKENS #IMPLIED
- span CDATA #IMPLIED
- level NMTOKEN #IMPLIED
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED>
- <!ELEMENT subblock (collection)*>
- <!ATTLIST subblock
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED>
- <!ELEMENT collection (component)*>
- <!ATTLIST collection
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED
- level NMTOKEN #IMPLIED>
- <!ELEMENT component (unit)*>
- <!ATTLIST component
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED
- deprecated CDATA #IMPLIED
- introduced CDATA #IMPLIED
- contract CDATA #IMPLIED
- plugin (Y|N) 'N'
- filter CDATA #IMPLIED
- class NMTOKENS #IMPLIED
- supports CDATA #IMPLIED
- purpose (optional|mandatory|development) 'optional'>
- <!ELEMENT unit EMPTY>
- <!ATTLIST unit
- mrp CDATA #IMPLIED
- filter CDATA #IMPLIED
- bldFile CDATA #IMPLIED
- root CDATA #IMPLIED
- version NMTOKEN #IMPLIED
- prebuilt NMTOKEN #IMPLIED
- late (Y|N) #IMPLIED
- priority CDATA #IMPLIED>
- <!ELEMENT SystemBuild (option*|target+|targetList+|list+|configuration+)*>
- <!ATTLIST SystemBuild schema CDATA #REQUIRED>
- <!ELEMENT list (ref+)>
- <!ATTLIST list
- name ID #REQUIRED
- description CDATA #REQUIRED>
- <!ELEMENT ref EMPTY>
- <!ATTLIST ref item CDATA #REQUIRED>
- <!ELEMENT targetList EMPTY>
- <!ATTLIST targetList
- name ID #REQUIRED
- description CDATA #REQUIRED
- target IDREFS #REQUIRED>
- <!ELEMENT target EMPTY>
- <!ATTLIST target
- name ID #REQUIRED
- abldTarget CDATA #REQUIRED
- description CDATA #REQUIRED>
- <!ELEMENT option EMPTY>
- <!ATTLIST option
- name ID #REQUIRED
- abldOption CDATA #REQUIRED
- description CDATA #REQUIRED
- enable (Y|N) #REQUIRED>
- <!ELEMENT configuration (listRef+|ref+|task+)*>
- <!ATTLIST configuration
- name ID #REQUIRED
- description CDATA #REQUIRED
- filter CDATA #REQUIRED>
- <!ELEMENT task (listRef*,(buildLayer|specialInstructions))>
- <!ELEMENT listRef EMPTY>
- <!ATTLIST listRef list CDATA #REQUIRED>
- <!ELEMENT buildLayer EMPTY>
- <!ATTLIST buildLayer
- command CDATA #REQUIRED
- targetList IDREFS #IMPLIED
- unitParallel (Y|N) #REQUIRED
- targetParallel (Y|N) 'N'>
- <!ELEMENT specialInstructions EMPTY>
- <!ATTLIST specialInstructions
- name CDATA #REQUIRED
- cwd CDATA #REQUIRED
- root CDATA #IMPLIED
- command CDATA #REQUIRED>
-]>
-<SystemDefinition schema="2.0.1" name="Symbian^3">
-<systemModel>
-<layer name="mw">
-<block name="shortlinkconn">
-<collection name="s60">
-<component name="shortlinkconn">
-<unit bldFile="/sf/mw/shortlinkconn/group" mrp=""/>
-</component>
-</collection>
-</block>
-</layer>
-</systemModel>
+<!DOCTYPE SystemDefinition [
+<!ELEMENT SystemDefinition ( systemModel )>
+<!ATTLIST SystemDefinition
+ name CDATA #REQUIRED
+ schema CDATA #REQUIRED
+>
+<!-- all paths are relative to the environment variable specified by the root attribute, or SOURCEROOT if not. -->
+
+<!-- System Model Section of DTD -->
+<!ELEMENT systemModel (layer+)>
+
+<!ELEMENT layer (block* | collection*)*>
+<!-- Kernel Services, Base Services, OS Services, Etc -->
+<!ATTLIST layer
+ name CDATA #REQUIRED
+ long-name CDATA #IMPLIED
+ levels NMTOKENS #IMPLIED
+ span CDATA #IMPLIED
+>
+
+<!ELEMENT block (subblock* | collection*)*>
+ <!-- Generic OS services, Comms Services, etc -->
+<!ATTLIST block
+ levels NMTOKENS #IMPLIED
+ span CDATA #IMPLIED
+ level NMTOKEN #IMPLIED
+ name CDATA #REQUIRED
+ long-name CDATA #IMPLIED
+>
+
+<!ELEMENT subblock (collection)*>
+<!-- Cellular Baseband Services, Networking Services, etc -->
+<!ATTLIST subblock
+ name CDATA #REQUIRED
+ long-name CDATA #IMPLIED
+>
+
+<!ELEMENT collection (component)*>
+<!-- Screen Driver, Content Handling, etc -->
+<!ATTLIST collection
+ name CDATA #REQUIRED
+ long-name CDATA #IMPLIED
+ level NMTOKEN #IMPLIED
+>
+
+<!ELEMENT component (unit)*>
+<!-- contains units or is a package or prebuilt -->
+<!ATTLIST component
+ name CDATA #REQUIRED
+ long-name CDATA #IMPLIED
+ deprecated CDATA #IMPLIED
+ introduced CDATA #IMPLIED
+ contract CDATA #IMPLIED
+ plugin (Y|N) "N"
+ filter CDATA #IMPLIED
+ class NMTOKENS #IMPLIED
+ supports CDATA #IMPLIED
+ purpose ( optional | mandatory | development ) "optional"
+>
+
+<!ELEMENT unit EMPTY >
+<!-- must be buildable (bld.inf) -->
+<!-- bldFile may someday be removed in favour of mrp -->
+<!ATTLIST unit
+ mrp CDATA #IMPLIED
+ filter CDATA #IMPLIED
+ bldFile CDATA #IMPLIED
+ root CDATA #IMPLIED
+ version NMTOKEN #IMPLIED
+ prebuilt NMTOKEN #IMPLIED
+ late (Y|N) #IMPLIED
+ priority CDATA #IMPLIED
+>
+]>
+<SystemDefinition name="Symbian^3" schema="2.0.1">
+ <systemModel>
+ <layer name="mw" long-name="Middleware" levels="generic specific">
+ <block name="shortlinkconn" level="generic" long-name="Shortlink Connectivity" levels="framework server generic specific plugin">
+ <!-- Package is pending removal. Contents to be moved to remoteconn and btservices -->
+ <collection name="localconnectivityservice" long-name="Local Connectivity Service" level="server">
+ <component name="locod" long-name="Local Connectivity Daemon">
+ <unit bldFile="/sf/mw/shortlinkconn/localconnectivityservice/locod/group"/>
+ </component>
+ <component name="obexserviceman" long-name="OBEX Service Managar">
+ <unit bldFile="/sf/mw/shortlinkconn/localconnectivityservice/obexserviceman/group"/>
+ </component>
+ <component name="obexsendservices" long-name="OBEX Send Services">
+ <unit bldFile="/sf/mw/shortlinkconn/localconnectivityservice/obexsendservices/group"/>
+ </component>
+ <component name="obexreceiveservices" long-name="OBEX Receive Services">
+ <unit bldFile="/sf/mw/shortlinkconn/localconnectivityservice/obexreceiveservices/group"/>
+ </component>
+ <component name="dun" long-name="Dial Up Networking">
+ <unit bldFile="/sf/mw/shortlinkconn/localconnectivityservice/dun/group"/>
+ </component>
+ <component name="lccustomplugin" long-name="LC Custom Plugins" plugin="Y">
+ <unit bldFile="/sf/mw/shortlinkconn/localconnectivityservice/lccustomplugin/group"/>
+ </component>
+ <component name="lcstylustap" long-name="LC Stylus Tap Plugins" plugin="Y">
+ <unit bldFile="/sf/mw/shortlinkconn/localconnectivityservice/lcstylustap/group"/>
+ </component>
+ <component name="legacymodemplugin" long-name="Legacy Modem Plugin" plugin="Y">
+ <unit bldFile="/sf/mw/shortlinkconn/localconnectivityservice/legacymodemplugin/group"/>
+ </component>
+ <component name="modematplugin" long-name="Modem AT Plugin" plugin="Y">
+ <unit bldFile="/sf/mw/shortlinkconn/localconnectivityservice/modematplugin/group"/>
+ </component>
+ <component name="generichid" long-name="Generic HID">
+ <unit bldFile="/sf/mw/shortlinkconn/localconnectivityservice/generichid/group"/>
+ </component>
+ <component name="headset" long-name="Headset">
+ <unit bldFile="/sf/mw/shortlinkconn/localconnectivityservice/headset/group"/>
+ </component>
+ </collection>
+ <collection name="shortlinkconn_info" long-name="Shortlink Connectivity Info" level="plugin">
+ <component name="shortlinkconn_plat" filter="s60" long-name="Shortlink Connectivity Platform Interfaces" class="api">
+ <unit bldFile="/sf/mw/shortlinkconn/shortlinkconn_plat/group"/>
+ </component>
+ </collection>
+ </block>
+ </layer>
+ </systemModel>
</SystemDefinition>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/symbian3/mw/shortlinkconn/package_definition_3.0.xml Mon Feb 15 18:25:55 2010 +0000
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<SystemDefinition schema="3.0.0">
+ <package id="shortlinkconn" name="Shortlink Connectivity" levels="framework server generic specific plugin">
+ <!-- Package is pending removal. Contents to be moved to remoteconn and btservices -->
+ <collection id="localconnectivityservice" name="Local Connectivity Service" level="server">
+ <component id="locod" name="Local Connectivity Daemon">
+ <unit bldFile="localconnectivityservice/locod/group"/>
+ </component>
+ <component id="obexserviceman" name="OBEX Service Managar">
+ <unit bldFile="localconnectivityservice/obexserviceman/group"/>
+ </component>
+ <component id="obexsendservices" name="OBEX Send Services">
+ <unit bldFile="localconnectivityservice/obexsendservices/group"/>
+ </component>
+ <component id="obexreceiveservices" name="OBEX Receive Services">
+ <unit bldFile="localconnectivityservice/obexreceiveservices/group"/>
+ </component>
+ <component id="dun" name="Dial Up Networking">
+ <unit bldFile="localconnectivityservice/dun/group"/>
+ </component>
+ <component id="lccustomplugin" name="LC Custom Plugins" class="plugin">
+ <unit bldFile="localconnectivityservice/lccustomplugin/group"/>
+ </component>
+ <component id="lcstylustap" name="LC Stylus Tap Plugins" class="plugin">
+ <unit bldFile="localconnectivityservice/lcstylustap/group"/>
+ </component>
+ <component id="legacymodemplugin" name="Legacy Modem Plugin" class="plugin">
+ <unit bldFile="localconnectivityservice/legacymodemplugin/group"/>
+ </component>
+ <component id="modematplugin" name="Modem AT Plugin" class="plugin">
+ <unit bldFile="localconnectivityservice/modematplugin/group"/>
+ </component>
+ <component id="generichid" name="Generic HID">
+ <unit bldFile="localconnectivityservice/generichid/group"/>
+ </component>
+ <component id="headset" name="Headset">
+ <unit bldFile="localconnectivityservice/headset/group"/>
+ </component>
+ </collection>
+ <collection id="shortlinkconn_info" name="Shortlink Connectivity Info" level="plugin">
+ <component id="shortlinkconn_plat" filter="s60" name="Shortlink Connectivity Platform Interfaces" class="api">
+ <unit bldFile="shortlinkconn_plat/group"/>
+ </component>
+ </collection>
+ </package>
+</SystemDefinition>
--- a/symbian3/mw/srvdiscovery/package_definition.xml Fri Feb 12 16:37:22 2010 +0000
+++ b/symbian3/mw/srvdiscovery/package_definition.xml Mon Feb 15 18:25:55 2010 +0000
@@ -1,119 +1,101 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE SystemDefinition [
- <!ELEMENT SystemDefinition (systemModel?,SystemBuild?)>
- <!ATTLIST SystemDefinition
- name CDATA #REQUIRED
- schema CDATA #REQUIRED>
- <!ELEMENT systemModel (layer+)>
- <!ELEMENT layer (block*|collection*)*>
- <!ATTLIST layer
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED
- levels NMTOKENS #IMPLIED
- span CDATA #IMPLIED>
- <!ELEMENT block (subblock*|collection*)*>
- <!ATTLIST block
- levels NMTOKENS #IMPLIED
- span CDATA #IMPLIED
- level NMTOKEN #IMPLIED
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED>
- <!ELEMENT subblock (collection)*>
- <!ATTLIST subblock
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED>
- <!ELEMENT collection (component)*>
- <!ATTLIST collection
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED
- level NMTOKEN #IMPLIED>
- <!ELEMENT component (unit)*>
- <!ATTLIST component
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED
- deprecated CDATA #IMPLIED
- introduced CDATA #IMPLIED
- contract CDATA #IMPLIED
- plugin (Y|N) 'N'
- filter CDATA #IMPLIED
- class NMTOKENS #IMPLIED
- supports CDATA #IMPLIED
- purpose (optional|mandatory|development) 'optional'>
- <!ELEMENT unit EMPTY>
- <!ATTLIST unit
- mrp CDATA #IMPLIED
- filter CDATA #IMPLIED
- bldFile CDATA #IMPLIED
- root CDATA #IMPLIED
- version NMTOKEN #IMPLIED
- prebuilt NMTOKEN #IMPLIED
- late (Y|N) #IMPLIED
- priority CDATA #IMPLIED>
- <!ELEMENT SystemBuild (option*|target+|targetList+|list+|configuration+)*>
- <!ATTLIST SystemBuild schema CDATA #REQUIRED>
- <!ELEMENT list (ref+)>
- <!ATTLIST list
- name ID #REQUIRED
- description CDATA #REQUIRED>
- <!ELEMENT ref EMPTY>
- <!ATTLIST ref item CDATA #REQUIRED>
- <!ELEMENT targetList EMPTY>
- <!ATTLIST targetList
- name ID #REQUIRED
- description CDATA #REQUIRED
- target IDREFS #REQUIRED>
- <!ELEMENT target EMPTY>
- <!ATTLIST target
- name ID #REQUIRED
- abldTarget CDATA #REQUIRED
- description CDATA #REQUIRED>
- <!ELEMENT option EMPTY>
- <!ATTLIST option
- name ID #REQUIRED
- abldOption CDATA #REQUIRED
- description CDATA #REQUIRED
- enable (Y|N) #REQUIRED>
- <!ELEMENT configuration (listRef+|ref+|task+)*>
- <!ATTLIST configuration
- name ID #REQUIRED
- description CDATA #REQUIRED
- filter CDATA #REQUIRED>
- <!ELEMENT task (listRef*,(buildLayer|specialInstructions))>
- <!ELEMENT listRef EMPTY>
- <!ATTLIST listRef list CDATA #REQUIRED>
- <!ELEMENT buildLayer EMPTY>
- <!ATTLIST buildLayer
- command CDATA #REQUIRED
- targetList IDREFS #IMPLIED
- unitParallel (Y|N) #REQUIRED
- targetParallel (Y|N) 'N'>
- <!ELEMENT specialInstructions EMPTY>
- <!ATTLIST specialInstructions
- name CDATA #REQUIRED
- cwd CDATA #REQUIRED
- root CDATA #IMPLIED
- command CDATA #REQUIRED>
-]>
-<SystemDefinition schema="2.0.1" name="Symbian^3">
-<systemModel>
-<layer name="mw" long-name="Middleware" levels="generic specific">
-<block name="srvdiscovery" level="generic" long-name="Service Discovery and Usage" levels="plugin framework server generic specific">
-<collection name="servicediscoveryandcontrol" long-name="Service Discovery and Control" level="framework">
-<component name="servicediscoveryfw" long-name="Service Discovery Framework" introduced="tb92" purpose="optional">
-<unit bldFile="/sf/mw/srvdiscovery/servicediscoveryandcontrol/pnp/group" mrp="/sf/mw/srvdiscovery/servicediscoveryandcontrol/pnp/group/servicediscoveryframework.mrp"/>
-</component>
-</collection>
-<collection name="srvdiscovery_info" long-name="Service Discovery and Usage Info" level="specific">
-<component name="srvdiscovery_metadata" long-name="Service Discovery and Usage Metadata" introduced="tb91" purpose="development" class="config PC">
-<unit mrp="/sf/mw/srvdiscovery/srvdiscovery_info/srvdiscovery_metadata/srvdiscovery_metadata.mrp"/>
-</component>
-</collection>
-<collection name="s60">
-<component name="upnp">
-<unit bldFile="/sf/mw/srvdiscovery/upnp/group" mrp=""/>
-</component>
-</collection>
-</block>
-</layer>
-</systemModel>
-</SystemDefinition>
\ No newline at end of file
+<!DOCTYPE SystemDefinition [
+<!ELEMENT SystemDefinition ( systemModel )>
+<!ATTLIST SystemDefinition
+ name CDATA #REQUIRED
+ schema CDATA #REQUIRED
+>
+<!-- all paths are relative to the environment variable specified by the root attribute, or SOURCEROOT if not. -->
+
+<!-- System Model Section of DTD -->
+<!ELEMENT systemModel (layer+)>
+
+<!ELEMENT layer (block* | collection*)*>
+<!-- Kernel Services, Base Services, OS Services, Etc -->
+<!ATTLIST layer
+ name CDATA #REQUIRED
+ long-name CDATA #IMPLIED
+ levels NMTOKENS #IMPLIED
+ span CDATA #IMPLIED
+>
+
+<!ELEMENT block (subblock* | collection*)*>
+ <!-- Generic OS services, Comms Services, etc -->
+<!ATTLIST block
+ levels NMTOKENS #IMPLIED
+ span CDATA #IMPLIED
+ level NMTOKEN #IMPLIED
+ name CDATA #REQUIRED
+ long-name CDATA #IMPLIED
+>
+
+<!ELEMENT subblock (collection)*>
+<!-- Cellular Baseband Services, Networking Services, etc -->
+<!ATTLIST subblock
+ name CDATA #REQUIRED
+ long-name CDATA #IMPLIED
+>
+
+<!ELEMENT collection (component)*>
+<!-- Screen Driver, Content Handling, etc -->
+<!ATTLIST collection
+ name CDATA #REQUIRED
+ long-name CDATA #IMPLIED
+ level NMTOKEN #IMPLIED
+>
+
+<!ELEMENT component (unit)*>
+<!-- contains units or is a package or prebuilt -->
+<!ATTLIST component
+ name CDATA #REQUIRED
+ long-name CDATA #IMPLIED
+ deprecated CDATA #IMPLIED
+ introduced CDATA #IMPLIED
+ contract CDATA #IMPLIED
+ plugin (Y|N) "N"
+ filter CDATA #IMPLIED
+ class NMTOKENS #IMPLIED
+ supports CDATA #IMPLIED
+ purpose ( optional | mandatory | development ) "optional"
+>
+
+<!ELEMENT unit EMPTY >
+<!-- must be buildable (bld.inf) -->
+<!-- bldFile may someday be removed in favour of mrp -->
+<!ATTLIST unit
+ mrp CDATA #IMPLIED
+ filter CDATA #IMPLIED
+ bldFile CDATA #IMPLIED
+ root CDATA #IMPLIED
+ version NMTOKEN #IMPLIED
+ prebuilt NMTOKEN #IMPLIED
+ late (Y|N) #IMPLIED
+ priority CDATA #IMPLIED
+>
+]>
+<SystemDefinition name="Symbian^3" schema="2.0.1">
+ <systemModel>
+ <layer name="mw" long-name="Middleware" levels="generic specific">
+ <block name="srvdiscovery" level="generic" long-name="Service Discovery and Usage" levels="plugin framework server generic specific">
+ <collection name="servicediscoveryandcontrol" long-name="Service Discovery and Control" level="framework">
+ <component name="servicediscoveryfw" long-name="Service Discovery Framework" introduced="^3" purpose="optional">
+ <unit bldFile="/sf/mw/srvdiscovery/servicediscoveryandcontrol/pnp/group" mrp="/sf/mw/srvdiscovery/servicediscoveryandcontrol/pnp/group/servicediscoveryframework.mrp"/>
+ </component>
+ </collection>
+ <collection name="upnp" long-name="UPnP" level="server">
+ <component name="upnpstack_plat" long-name="UPnP Stack Platform Interfaces" introduced="^3" purpose="optional" class="api">
+ <unit bldFile="/sf/mw/srvdiscovery/servicediscoveryandcontrol/upnpstack_plat/group"/>
+ </component>
+ <component name="upnpstack" long-name="UPnP Stack" introduced="^3" purpose="optional">
+ <unit bldFile="/sf/mw/srvdiscovery/servicediscoveryandcontrol/upnpstack/group"/>
+ </component>
+ </collection>
+ <collection name="srvdiscovery_info" long-name="Service Discovery and Usage Info" level="specific">
+ <component name="srvdiscovery_metadata" long-name="Service Discovery and Usage Metadata" introduced="^2" purpose="development" class="config PC">
+ <unit mrp="/sf/mw/srvdiscovery/srvdiscovery_info/srvdiscovery_metadata/srvdiscovery_metadata.mrp"/>
+ </component>
+ </collection>
+ </block>
+ </layer>
+ </systemModel>
+</SystemDefinition>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/symbian3/mw/srvdiscovery/package_definition_3.0.xml Mon Feb 15 18:25:55 2010 +0000
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<SystemDefinition schema="3.0.0">
+ <package id="srvdiscovery" name="Service Discovery and Usage" levels="plugin framework server generic specific">
+ <collection id="servicediscoveryandcontrol" name="Service Discovery and Control" level="framework">
+ <component id="servicediscoveryfw" name="Service Discovery Framework" introduced="^3" purpose="optional">
+ <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"/>
+ </component>
+ </collection>
+ </package>
+</SystemDefinition>
--- a/symbian3/mw/svgt/package_definition.xml Fri Feb 12 16:37:22 2010 +0000
+++ b/symbian3/mw/svgt/package_definition.xml Mon Feb 15 18:25:55 2010 +0000
@@ -1,109 +1,97 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE SystemDefinition [
- <!ELEMENT SystemDefinition (systemModel?,SystemBuild?)>
- <!ATTLIST SystemDefinition
- name CDATA #REQUIRED
- schema CDATA #REQUIRED>
- <!ELEMENT systemModel (layer+)>
- <!ELEMENT layer (block*|collection*)*>
- <!ATTLIST layer
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED
- levels NMTOKENS #IMPLIED
- span CDATA #IMPLIED>
- <!ELEMENT block (subblock*|collection*)*>
- <!ATTLIST block
- levels NMTOKENS #IMPLIED
- span CDATA #IMPLIED
- level NMTOKEN #IMPLIED
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED>
- <!ELEMENT subblock (collection)*>
- <!ATTLIST subblock
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED>
- <!ELEMENT collection (component)*>
- <!ATTLIST collection
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED
- level NMTOKEN #IMPLIED>
- <!ELEMENT component (unit)*>
- <!ATTLIST component
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED
- deprecated CDATA #IMPLIED
- introduced CDATA #IMPLIED
- contract CDATA #IMPLIED
- plugin (Y|N) 'N'
- filter CDATA #IMPLIED
- class NMTOKENS #IMPLIED
- supports CDATA #IMPLIED
- purpose (optional|mandatory|development) 'optional'>
- <!ELEMENT unit EMPTY>
- <!ATTLIST unit
- mrp CDATA #IMPLIED
- filter CDATA #IMPLIED
- bldFile CDATA #IMPLIED
- root CDATA #IMPLIED
- version NMTOKEN #IMPLIED
- prebuilt NMTOKEN #IMPLIED
- late (Y|N) #IMPLIED
- priority CDATA #IMPLIED>
- <!ELEMENT SystemBuild (option*|target+|targetList+|list+|configuration+)*>
- <!ATTLIST SystemBuild schema CDATA #REQUIRED>
- <!ELEMENT list (ref+)>
- <!ATTLIST list
- name ID #REQUIRED
- description CDATA #REQUIRED>
- <!ELEMENT ref EMPTY>
- <!ATTLIST ref item CDATA #REQUIRED>
- <!ELEMENT targetList EMPTY>
- <!ATTLIST targetList
- name ID #REQUIRED
- description CDATA #REQUIRED
- target IDREFS #REQUIRED>
- <!ELEMENT target EMPTY>
- <!ATTLIST target
- name ID #REQUIRED
- abldTarget CDATA #REQUIRED
- description CDATA #REQUIRED>
- <!ELEMENT option EMPTY>
- <!ATTLIST option
- name ID #REQUIRED
- abldOption CDATA #REQUIRED
- description CDATA #REQUIRED
- enable (Y|N) #REQUIRED>
- <!ELEMENT configuration (listRef+|ref+|task+)*>
- <!ATTLIST configuration
- name ID #REQUIRED
- description CDATA #REQUIRED
- filter CDATA #REQUIRED>
- <!ELEMENT task (listRef*,(buildLayer|specialInstructions))>
- <!ELEMENT listRef EMPTY>
- <!ATTLIST listRef list CDATA #REQUIRED>
- <!ELEMENT buildLayer EMPTY>
- <!ATTLIST buildLayer
- command CDATA #REQUIRED
- targetList IDREFS #IMPLIED
- unitParallel (Y|N) #REQUIRED
- targetParallel (Y|N) 'N'>
- <!ELEMENT specialInstructions EMPTY>
- <!ATTLIST specialInstructions
- name CDATA #REQUIRED
- cwd CDATA #REQUIRED
- root CDATA #IMPLIED
- command CDATA #REQUIRED>
-]>
-<SystemDefinition schema="2.0.1" name="Symbian^3">
-<systemModel>
-<layer name="mw">
-<block name="svgt">
-<collection name="s60">
-<component name="svgt">
-<unit bldFile="/sf/mw/svgt/group" mrp=""/>
-</component>
-</collection>
-</block>
-</layer>
-</systemModel>
+<!DOCTYPE SystemDefinition [
+<!ELEMENT SystemDefinition ( systemModel )>
+<!ATTLIST SystemDefinition
+ name CDATA #REQUIRED
+ schema CDATA #REQUIRED
+>
+<!-- all paths are relative to the environment variable specified by the root attribute, or SOURCEROOT if not. -->
+
+<!-- System Model Section of DTD -->
+<!ELEMENT systemModel (layer+)>
+
+<!ELEMENT layer (block* | collection*)*>
+<!-- Kernel Services, Base Services, OS Services, Etc -->
+<!ATTLIST layer
+ name CDATA #REQUIRED
+ long-name CDATA #IMPLIED
+ levels NMTOKENS #IMPLIED
+ span CDATA #IMPLIED
+>
+
+<!ELEMENT block (subblock* | collection*)*>
+ <!-- Generic OS services, Comms Services, etc -->
+<!ATTLIST block
+ levels NMTOKENS #IMPLIED
+ span CDATA #IMPLIED
+ level NMTOKEN #IMPLIED
+ name CDATA #REQUIRED
+ long-name CDATA #IMPLIED
+>
+
+<!ELEMENT subblock (collection)*>
+<!-- Cellular Baseband Services, Networking Services, etc -->
+<!ATTLIST subblock
+ name CDATA #REQUIRED
+ long-name CDATA #IMPLIED
+>
+
+<!ELEMENT collection (component)*>
+<!-- Screen Driver, Content Handling, etc -->
+<!ATTLIST collection
+ name CDATA #REQUIRED
+ long-name CDATA #IMPLIED
+ level NMTOKEN #IMPLIED
+>
+
+<!ELEMENT component (unit)*>
+<!-- contains units or is a package or prebuilt -->
+<!ATTLIST component
+ name CDATA #REQUIRED
+ long-name CDATA #IMPLIED
+ deprecated CDATA #IMPLIED
+ introduced CDATA #IMPLIED
+ contract CDATA #IMPLIED
+ plugin (Y|N) "N"
+ filter CDATA #IMPLIED
+ class NMTOKENS #IMPLIED
+ supports CDATA #IMPLIED
+ purpose ( optional | mandatory | development ) "optional"
+>
+
+<!ELEMENT unit EMPTY >
+<!-- must be buildable (bld.inf) -->
+<!-- bldFile may someday be removed in favour of mrp -->
+<!ATTLIST unit
+ mrp CDATA #IMPLIED
+ filter CDATA #IMPLIED
+ bldFile CDATA #IMPLIED
+ root CDATA #IMPLIED
+ version NMTOKEN #IMPLIED
+ prebuilt NMTOKEN #IMPLIED
+ late (Y|N) #IMPLIED
+ priority CDATA #IMPLIED
+>
+]>
+<SystemDefinition name="Symbian^3" schema="2.0.1">
+ <systemModel>
+ <layer name="mw" long-name="Middleware" levels="generic specific">
+ <block name="svgt" level="generic" long-name="SVG Tiny" levels="util ui">
+ <collection name="svgt_info" long-name="SVG Tiny Info" level="ui">
+ <component name="svgt_plat" filter="s60" long-name="SVG Tiny Platform Interfaces" introduced="9.2" class="api">
+ <unit bldFile="/sf/mw/svgt/svgt_plat/group"/>
+ </component>
+ </collection>
+ <collection name="svgtopt" long-name="SVG-T Engine" level="util">
+ <component name="svgtopt_build" filter="s60" long-name="SVG Engine" introduced="9.2">
+ <!-- component is at collection level. Needs to be moved down a directory -->
+ <unit bldFile="/sf/mw/svgt/svgtopt/group"/>
+ </component>
+ <component name="svgtplugin" filter="s60" long-name="SVG Plugin" introduced="9.2" plugin="Y">
+ <unit bldFile="/sf/mw/svgt/svgtopt/svgtplugin/group"/>
+ </component>
+ </collection>
+ </block>
+ </layer>
+ </systemModel>
</SystemDefinition>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/symbian3/mw/svgt/package_definition_3.0.xml Mon Feb 15 18:25:55 2010 +0000
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<SystemDefinition schema="3.0.0">
+ <package id="svgt" name="SVG Tiny" levels="util ui">
+ <collection id="svgt_info" name="SVG Tiny Info" level="ui">
+ <component id="svgt_plat" filter="s60" name="SVG Tiny Platform Interfaces" class="api" introduced="9.2">
+ <unit bldFile="svgt_plat/group"/>
+ </component>
+ </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="svgtplugin" filter="s60" name="SVG Plugin" class="plugin" introduced="9.2">
+ <unit bldFile="svgtopt/svgtplugin/group"/>
+ </component>
+ </collection>
+ </package>
+</SystemDefinition>
--- a/symbian3/mw/uiaccelerator/package_definition.xml Fri Feb 12 16:37:22 2010 +0000
+++ b/symbian3/mw/uiaccelerator/package_definition.xml Mon Feb 15 18:25:55 2010 +0000
@@ -1,109 +1,97 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE SystemDefinition [
- <!ELEMENT SystemDefinition (systemModel?,SystemBuild?)>
- <!ATTLIST SystemDefinition
- name CDATA #REQUIRED
- schema CDATA #REQUIRED>
- <!ELEMENT systemModel (layer+)>
- <!ELEMENT layer (block*|collection*)*>
- <!ATTLIST layer
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED
- levels NMTOKENS #IMPLIED
- span CDATA #IMPLIED>
- <!ELEMENT block (subblock*|collection*)*>
- <!ATTLIST block
- levels NMTOKENS #IMPLIED
- span CDATA #IMPLIED
- level NMTOKEN #IMPLIED
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED>
- <!ELEMENT subblock (collection)*>
- <!ATTLIST subblock
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED>
- <!ELEMENT collection (component)*>
- <!ATTLIST collection
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED
- level NMTOKEN #IMPLIED>
- <!ELEMENT component (unit)*>
- <!ATTLIST component
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED
- deprecated CDATA #IMPLIED
- introduced CDATA #IMPLIED
- contract CDATA #IMPLIED
- plugin (Y|N) 'N'
- filter CDATA #IMPLIED
- class NMTOKENS #IMPLIED
- supports CDATA #IMPLIED
- purpose (optional|mandatory|development) 'optional'>
- <!ELEMENT unit EMPTY>
- <!ATTLIST unit
- mrp CDATA #IMPLIED
- filter CDATA #IMPLIED
- bldFile CDATA #IMPLIED
- root CDATA #IMPLIED
- version NMTOKEN #IMPLIED
- prebuilt NMTOKEN #IMPLIED
- late (Y|N) #IMPLIED
- priority CDATA #IMPLIED>
- <!ELEMENT SystemBuild (option*|target+|targetList+|list+|configuration+)*>
- <!ATTLIST SystemBuild schema CDATA #REQUIRED>
- <!ELEMENT list (ref+)>
- <!ATTLIST list
- name ID #REQUIRED
- description CDATA #REQUIRED>
- <!ELEMENT ref EMPTY>
- <!ATTLIST ref item CDATA #REQUIRED>
- <!ELEMENT targetList EMPTY>
- <!ATTLIST targetList
- name ID #REQUIRED
- description CDATA #REQUIRED
- target IDREFS #REQUIRED>
- <!ELEMENT target EMPTY>
- <!ATTLIST target
- name ID #REQUIRED
- abldTarget CDATA #REQUIRED
- description CDATA #REQUIRED>
- <!ELEMENT option EMPTY>
- <!ATTLIST option
- name ID #REQUIRED
- abldOption CDATA #REQUIRED
- description CDATA #REQUIRED
- enable (Y|N) #REQUIRED>
- <!ELEMENT configuration (listRef+|ref+|task+)*>
- <!ATTLIST configuration
- name ID #REQUIRED
- description CDATA #REQUIRED
- filter CDATA #REQUIRED>
- <!ELEMENT task (listRef*,(buildLayer|specialInstructions))>
- <!ELEMENT listRef EMPTY>
- <!ATTLIST listRef list CDATA #REQUIRED>
- <!ELEMENT buildLayer EMPTY>
- <!ATTLIST buildLayer
- command CDATA #REQUIRED
- targetList IDREFS #IMPLIED
- unitParallel (Y|N) #REQUIRED
- targetParallel (Y|N) 'N'>
- <!ELEMENT specialInstructions EMPTY>
- <!ATTLIST specialInstructions
- name CDATA #REQUIRED
- cwd CDATA #REQUIRED
- root CDATA #IMPLIED
- command CDATA #REQUIRED>
-]>
-<SystemDefinition schema="2.0.1" name="Symbian^3">
-<systemModel>
-<layer name="mw">
-<block name="uiaccelerator">
-<collection name="s60">
-<component name="uiaccelerator">
-<unit bldFile="/sf/mw/uiaccelerator/group" mrp=""/>
-</component>
-</collection>
-</block>
-</layer>
-</systemModel>
+<!DOCTYPE SystemDefinition [
+<!ELEMENT SystemDefinition ( systemModel )>
+<!ATTLIST SystemDefinition
+ name CDATA #REQUIRED
+ schema CDATA #REQUIRED
+>
+<!-- all paths are relative to the environment variable specified by the root attribute, or SOURCEROOT if not. -->
+
+<!-- System Model Section of DTD -->
+<!ELEMENT systemModel (layer+)>
+
+<!ELEMENT layer (block* | collection*)*>
+<!-- Kernel Services, Base Services, OS Services, Etc -->
+<!ATTLIST layer
+ name CDATA #REQUIRED
+ long-name CDATA #IMPLIED
+ levels NMTOKENS #IMPLIED
+ span CDATA #IMPLIED
+>
+
+<!ELEMENT block (subblock* | collection*)*>
+ <!-- Generic OS services, Comms Services, etc -->
+<!ATTLIST block
+ levels NMTOKENS #IMPLIED
+ span CDATA #IMPLIED
+ level NMTOKEN #IMPLIED
+ name CDATA #REQUIRED
+ long-name CDATA #IMPLIED
+>
+
+<!ELEMENT subblock (collection)*>
+<!-- Cellular Baseband Services, Networking Services, etc -->
+<!ATTLIST subblock
+ name CDATA #REQUIRED
+ long-name CDATA #IMPLIED
+>
+
+<!ELEMENT collection (component)*>
+<!-- Screen Driver, Content Handling, etc -->
+<!ATTLIST collection
+ name CDATA #REQUIRED
+ long-name CDATA #IMPLIED
+ level NMTOKEN #IMPLIED
+>
+
+<!ELEMENT component (unit)*>
+<!-- contains units or is a package or prebuilt -->
+<!ATTLIST component
+ name CDATA #REQUIRED
+ long-name CDATA #IMPLIED
+ deprecated CDATA #IMPLIED
+ introduced CDATA #IMPLIED
+ contract CDATA #IMPLIED
+ plugin (Y|N) "N"
+ filter CDATA #IMPLIED
+ class NMTOKENS #IMPLIED
+ supports CDATA #IMPLIED
+ purpose ( optional | mandatory | development ) "optional"
+>
+
+<!ELEMENT unit EMPTY >
+<!-- must be buildable (bld.inf) -->
+<!-- bldFile may someday be removed in favour of mrp -->
+<!ATTLIST unit
+ mrp CDATA #IMPLIED
+ filter CDATA #IMPLIED
+ bldFile CDATA #IMPLIED
+ root CDATA #IMPLIED
+ version NMTOKEN #IMPLIED
+ prebuilt NMTOKEN #IMPLIED
+ late (Y|N) #IMPLIED
+ priority CDATA #IMPLIED
+>
+]>
+<SystemDefinition name="Symbian^3" schema="2.0.1">
+ <systemModel>
+ <layer name="mw" long-name="Middleware" levels="generic specific">
+ <block name="uiaccelerator" level="generic" long-name="UI Accelerator" levels="plugin framework server ex if">
+ <collection name="uiaccelerator_info" long-name="UI Accelerator Info" level="if">
+ <component name="uiaccelerator_plat" filter="s60" long-name="UI Accelerator Platform Interfaces" class="api">
+ <unit bldFile="/sf/mw/uiaccelerator/uiaccelerator_plat/group"/>
+ </component>
+ </collection>
+ <collection name="uiacceltk" long-name="UI Accelerator Toolkit" level="framework">
+ <component name="hitchcock" filter="s60" long-name="Hitchcock">
+ <unit bldFile="/sf/mw/uiaccelerator/uiacceltk/hitchcock/group"/>
+ </component>
+ <component name="uiacceltk_build" filter="s60" long-name="UI Accelerator Toolkit Build">
+ <!-- move into the other component, or remove the #include and make this UI Accelerator Toolkit ROM-->
+ <unit bldFile="/sf/mw/uiaccelerator/uiacceltk/group"/>
+ </component>
+ </collection>
+ </block>
+ </layer>
+ </systemModel>
</SystemDefinition>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/symbian3/mw/uiaccelerator/package_definition_3.0.xml Mon Feb 15 18:25:55 2010 +0000
@@ -0,0 +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"/>
+ </component>
+ <component id="uiacceltk_build" filter="s60" name="UI Accelerator Toolkit Build">
+ <!-- move into the other component, or remove the #include and make this UI Accelerator Toolkit ROM-->
+ <unit bldFile="uiacceltk/group"/>
+ </component>
+ </collection>
+ </package>
+</SystemDefinition>
--- a/symbian3/mw/uiresources/package_definition.xml Fri Feb 12 16:37:22 2010 +0000
+++ b/symbian3/mw/uiresources/package_definition.xml Mon Feb 15 18:25:55 2010 +0000
@@ -1,109 +1,173 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE SystemDefinition [
- <!ELEMENT SystemDefinition (systemModel?,SystemBuild?)>
- <!ATTLIST SystemDefinition
- name CDATA #REQUIRED
- schema CDATA #REQUIRED>
- <!ELEMENT systemModel (layer+)>
- <!ELEMENT layer (block*|collection*)*>
- <!ATTLIST layer
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED
- levels NMTOKENS #IMPLIED
- span CDATA #IMPLIED>
- <!ELEMENT block (subblock*|collection*)*>
- <!ATTLIST block
- levels NMTOKENS #IMPLIED
- span CDATA #IMPLIED
- level NMTOKEN #IMPLIED
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED>
- <!ELEMENT subblock (collection)*>
- <!ATTLIST subblock
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED>
- <!ELEMENT collection (component)*>
- <!ATTLIST collection
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED
- level NMTOKEN #IMPLIED>
- <!ELEMENT component (unit)*>
- <!ATTLIST component
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED
- deprecated CDATA #IMPLIED
- introduced CDATA #IMPLIED
- contract CDATA #IMPLIED
- plugin (Y|N) 'N'
- filter CDATA #IMPLIED
- class NMTOKENS #IMPLIED
- supports CDATA #IMPLIED
- purpose (optional|mandatory|development) 'optional'>
- <!ELEMENT unit EMPTY>
- <!ATTLIST unit
- mrp CDATA #IMPLIED
- filter CDATA #IMPLIED
- bldFile CDATA #IMPLIED
- root CDATA #IMPLIED
- version NMTOKEN #IMPLIED
- prebuilt NMTOKEN #IMPLIED
- late (Y|N) #IMPLIED
- priority CDATA #IMPLIED>
- <!ELEMENT SystemBuild (option*|target+|targetList+|list+|configuration+)*>
- <!ATTLIST SystemBuild schema CDATA #REQUIRED>
- <!ELEMENT list (ref+)>
- <!ATTLIST list
- name ID #REQUIRED
- description CDATA #REQUIRED>
- <!ELEMENT ref EMPTY>
- <!ATTLIST ref item CDATA #REQUIRED>
- <!ELEMENT targetList EMPTY>
- <!ATTLIST targetList
- name ID #REQUIRED
- description CDATA #REQUIRED
- target IDREFS #REQUIRED>
- <!ELEMENT target EMPTY>
- <!ATTLIST target
- name ID #REQUIRED
- abldTarget CDATA #REQUIRED
- description CDATA #REQUIRED>
- <!ELEMENT option EMPTY>
- <!ATTLIST option
- name ID #REQUIRED
- abldOption CDATA #REQUIRED
- description CDATA #REQUIRED
- enable (Y|N) #REQUIRED>
- <!ELEMENT configuration (listRef+|ref+|task+)*>
- <!ATTLIST configuration
- name ID #REQUIRED
- description CDATA #REQUIRED
- filter CDATA #REQUIRED>
- <!ELEMENT task (listRef*,(buildLayer|specialInstructions))>
- <!ELEMENT listRef EMPTY>
- <!ATTLIST listRef list CDATA #REQUIRED>
- <!ELEMENT buildLayer EMPTY>
- <!ATTLIST buildLayer
- command CDATA #REQUIRED
- targetList IDREFS #IMPLIED
- unitParallel (Y|N) #REQUIRED
- targetParallel (Y|N) 'N'>
- <!ELEMENT specialInstructions EMPTY>
- <!ATTLIST specialInstructions
- name CDATA #REQUIRED
- cwd CDATA #REQUIRED
- root CDATA #IMPLIED
- command CDATA #REQUIRED>
-]>
-<SystemDefinition schema="2.0.1" name="Symbian^3">
-<systemModel>
-<layer name="mw">
-<block name="uiresources">
-<collection name="s60">
-<component name="uiresources">
-<unit bldFile="/sf/mw/uiresources/group" mrp=""/>
-</component>
-</collection>
-</block>
-</layer>
-</systemModel>
+<!DOCTYPE SystemDefinition [
+<!ELEMENT SystemDefinition ( systemModel )>
+<!ATTLIST SystemDefinition
+ name CDATA #REQUIRED
+ schema CDATA #REQUIRED
+>
+<!-- all paths are relative to the environment variable specified by the root attribute, or SOURCEROOT if not. -->
+
+<!-- System Model Section of DTD -->
+<!ELEMENT systemModel (layer+)>
+
+<!ELEMENT layer (block* | collection*)*>
+<!-- Kernel Services, Base Services, OS Services, Etc -->
+<!ATTLIST layer
+ name CDATA #REQUIRED
+ long-name CDATA #IMPLIED
+ levels NMTOKENS #IMPLIED
+ span CDATA #IMPLIED
+>
+
+<!ELEMENT block (subblock* | collection*)*>
+ <!-- Generic OS services, Comms Services, etc -->
+<!ATTLIST block
+ levels NMTOKENS #IMPLIED
+ span CDATA #IMPLIED
+ level NMTOKEN #IMPLIED
+ name CDATA #REQUIRED
+ long-name CDATA #IMPLIED
+>
+
+<!ELEMENT subblock (collection)*>
+<!-- Cellular Baseband Services, Networking Services, etc -->
+<!ATTLIST subblock
+ name CDATA #REQUIRED
+ long-name CDATA #IMPLIED
+>
+
+<!ELEMENT collection (component)*>
+<!-- Screen Driver, Content Handling, etc -->
+<!ATTLIST collection
+ name CDATA #REQUIRED
+ long-name CDATA #IMPLIED
+ level NMTOKEN #IMPLIED
+>
+
+<!ELEMENT component (unit)*>
+<!-- contains units or is a package or prebuilt -->
+<!ATTLIST component
+ name CDATA #REQUIRED
+ long-name CDATA #IMPLIED
+ deprecated CDATA #IMPLIED
+ introduced CDATA #IMPLIED
+ contract CDATA #IMPLIED
+ plugin (Y|N) "N"
+ filter CDATA #IMPLIED
+ class NMTOKENS #IMPLIED
+ supports CDATA #IMPLIED
+ purpose ( optional | mandatory | development ) "optional"
+>
+
+<!ELEMENT unit EMPTY >
+<!-- must be buildable (bld.inf) -->
+<!-- bldFile may someday be removed in favour of mrp -->
+<!ATTLIST unit
+ mrp CDATA #IMPLIED
+ filter CDATA #IMPLIED
+ bldFile CDATA #IMPLIED
+ root CDATA #IMPLIED
+ version NMTOKEN #IMPLIED
+ prebuilt NMTOKEN #IMPLIED
+ late (Y|N) #IMPLIED
+ priority CDATA #IMPLIED
+>
+]>
+<SystemDefinition name="Symbian^3" schema="2.0.1">
+ <systemModel>
+ <layer name="mw" long-name="Middleware" levels="generic specific">
+ <block name="uiresources" level="generic" long-name="UI Resources" levels="compile plugin framework server generic data">
+ <collection name="uiresources_info" long-name="UI Resources Info" level="data">
+ <component name="uiresources_plat" filter="s60" long-name="UI Resources Platform Interfaces" class="api">
+ <unit bldFile="/sf/mw/uiresources/uiresources_plat/group"/>
+ </component>
+ <component name="uiresources_pub" filter="s60" long-name="UI Resources Public Interfaces" class="api">
+ <unit bldFile="/sf/mw/uiresources/uiresources_pub/group"/>
+ </component>
+ <component name="uiresources_test" filter="s60,api_test" long-name="UI Resources Tests" purpose="development">
+ <unit bldFile="/sf/mw/uiresources/tsrc/group" filter="uiresources_api_all"/>
+ </component>
+ <!-- are these custom filters needed? -->
+ <component name="uiresources_test_pat" filter="s60,api_test" long-name="UI Resources Platform API Tests" purpose="development">
+ <!-- can only have one unit. Need to #include from a common one -->
+ <unit bldFile="/sf/mw/uiresources/uiresources_plat/cdl_api/tsrc/group" filter="cdl_api"/>
+ <unit bldFile="/sf/mw/uiresources/uiresources_plat/extended_fonts_api/tsrc/group" filter="extended_fonts_api"/>
+ <unit bldFile="/sf/mw/uiresources/uiresources_plat/extended_skins_api/tsrc/group" filter="extended_skins_api"/>
+ <unit bldFile="/sf/mw/uiresources/uiresources_plat/graphic_configuration_api/tsrc/group" filter="graphic_configuration_api"/>
+ <unit bldFile="/sf/mw/uiresources/uiresources_plat/layout_data_api/tsrc/group" filter="layout_data_api"/>
+ <unit bldFile="/sf/mw/uiresources/uiresources_plat/layout_system_private_api/tsrc/group" filter="layout_system_private_api"/>
+ </component>
+ <component name="uiresources_test_pat" filter="s60,api_test" long-name="UI Resources Public API Tests" purpose="development">
+ <!-- can only have one unit. Need to #include from a common one -->
+ <unit bldFile="/sf/mw/uiresources/uiresources_plat/skins_image_attributes_api/tsrc/group" filter="skins_image_attributes_api"/>
+ <unit bldFile="/sf/mw/uiresources/uiresources_pub/font_definition_api/tsrc/group" filter="font_definition_api"/>
+ <unit bldFile="/sf/mw/uiresources/uiresources_pub/graphics_api/tsrc/group" filter="graphics_api"/>
+ <unit bldFile="/sf/mw/uiresources/uiresources_pub/pictograph_api/tsrc/group" filter="pictograph_api"/>
+ <unit bldFile="/sf/mw/uiresources/uiresources_pub/skins_api/tsrc/group" filter="skins_api"/>
+ </component>
+ </collection>
+ <collection name="uigraphics" long-name="UI Graphics" level="generic">
+ <component name="bitmaps2" filter="s60" long-name="Bitmaps 2" class="config">
+ <unit bldFile="/sf/mw/uiresources/uigraphics/bitmaps2/group"/>
+ </component>
+ <component name="icons" filter="s60" long-name="Icons" class="config">
+ <unit bldFile="/sf/mw/uiresources/uigraphics/icons/group"/>
+ </component>
+ <component name="variatedbitmaps" filter="s60" long-name="Variated Bitmaps" class="config">
+ <unit bldFile="/sf/mw/uiresources/uigraphics/variatedbitmaps/group"/>
+ </component>
+ <component name="aknicon" filter="s60" long-name="Avkon Icon Framework">
+ <unit bldFile="/sf/mw/uiresources/uigraphics/aknicon/group"/>
+ </component>
+ </collection>
+ <collection name="layouts" long-name="Layouts" level="plugin">
+ <component name="cdl" filter="s60" long-name="Customization Definition Language">
+ <!-- can only have one unit. Need to #include them or split into multiple components -->
+ <unit bldFile="/sf/mw/uiresources/layouts/cdl/cdlengine/group"/>
+ <unit bldFile="/sf/mw/uiresources/layouts/cdl/cdlserver/group"/>
+ </component>
+ <component name="aknlayout2" filter="s60" long-name="Avkon Layout 2">
+ <unit bldFile="/sf/mw/uiresources/layouts/aknlayout2/group"/>
+ </component>
+ </collection>
+ <collection name="skins" long-name="Skins" level="data">
+ <component name="aknskincontent" filter="s60" long-name="Avkon Skin Content" class="config">
+ <unit bldFile="/sf/mw/uiresources/skins/aknskincontent/group"/>
+ </component>
+ <component name="aknskins" filter="s60" long-name="Avkon Skin Compiler">
+ <unit bldFile="/sf/mw/uiresources/skins/aknskins/group"/>
+ </component>
+ </collection>
+ <collection name="pictographs" long-name="Pictographs" level="data">
+ <component name="aknpictograph" filter="s60" long-name="Avkon Pictograph">
+ <unit bldFile="/sf/mw/uiresources/pictographs/aknpictograph/group"/>
+ </component>
+ </collection>
+ <collection name="locales" long-name="Locales" level="framework">
+ <component name="locales_build" filter="s60" long-name="Locales Build">
+ <unit bldFile="/sf/mw/uiresources/locales/loce32"/>
+ </component>
+ </collection>
+ <collection name="uiconfig" long-name="UI Config" level="server">
+ <component name="s60config" filter="s60" long-name="S60 UI Config">
+ <unit bldFile="/sf/mw/uiresources/uiconfig/s60config/group"/>
+ </component>
+ </collection>
+ <collection name="fontsupport" long-name="Font Support" level="generic">
+ <component name="fontprovider" filter="s60" long-name="Font Provider">
+ <unit bldFile="/sf/mw/uiresources/fontsupport/fontprovider/group"/>
+ </component>
+ <component name="fontutils" filter="s60" long-name="Font Utils">
+ <unit bldFile="/sf/mw/uiresources/fontsupport/fontutils/group"/>
+ </component>
+ </collection>
+ <collection name="helpthemes" long-name="Help Themes" level="data">
+ <!-- collection is really a component. Need to move down a directory -->
+ <component name="helpthemes_build" filter="s60" long-name="Help Themes Build" class="config">
+ <unit bldFile="/sf/mw/uiresources/helpthemes/group"/>
+ </component>
+ </collection>
+ </block>
+ </layer>
+ </systemModel>
</SystemDefinition>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/symbian3/mw/uiresources/package_definition_3.0.xml Mon Feb 15 18:25:55 2010 +0000
@@ -0,0 +1,95 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<SystemDefinition schema="3.0.0">
+ <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">
+ <unit bldFile="uiresources_plat/group"/>
+ </component>
+ <component id="uiresources_pub" filter="s60" name="UI Resources Public Interfaces" class="api">
+ <unit bldFile="uiresources_pub/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">
+ <unit bldFile="uigraphics/bitmaps2/group"/>
+ </component>
+ <component id="icons" filter="s60" class="config" name="Icons">
+ <unit bldFile="uigraphics/icons/group"/>
+ </component>
+ <component id="variatedbitmaps" filter="s60" name="Variated Bitmaps" class="config">
+ <unit bldFile="uigraphics/variatedbitmaps/group"/>
+ </component>
+ <component id="aknicon" filter="s60" name="Avkon Icon Framework">
+ <unit bldFile="uigraphics/aknicon/group"/>
+ </component>
+ </collection>
+ <collection id="layouts" name="Layouts" level="plugin">
+ <component id="cdl" filter="s60" name="Customization Definition Language">
+ <!-- can only have one unit. Need to #include them or split into multiple components -->
+ <unit bldFile="layouts/cdl/cdlengine/group"/>
+ <unit bldFile="layouts/cdl/cdlserver/group"/>
+ </component>
+ <component id="aknlayout2" filter="s60" name="Avkon Layout 2">
+ <unit bldFile="layouts/aknlayout2/group"/>
+ </component>
+ </collection>
+ <collection id="skins" name="Skins" level="data">
+ <component id="aknskincontent" filter="s60" name="Avkon Skin Content" class="config">
+ <unit bldFile="skins/aknskincontent/group"/>
+ </component>
+ <component id="aknskins" filter="s60" name="Avkon Skin Compiler">
+ <unit bldFile="skins/aknskins/group"/>
+ </component>
+ </collection>
+ <collection id="pictographs" name="Pictographs" level="data">
+ <component id="aknpictograph" filter="s60" name="Avkon Pictograph">
+ <unit bldFile="pictographs/aknpictograph/group"/>
+ </component>
+ </collection>
+ <collection id="locales" name="Locales" level="framework">
+ <component id="locales_build" filter="s60" name="Locales Build">
+ <unit bldFile="locales/loce32"/>
+ </component>
+ </collection>
+ <collection id="uiconfig" name="UI Config" level="server">
+ <component id="s60config" filter="s60" name="S60 UI Config">
+ <unit bldFile="uiconfig/s60config/group"/>
+ </component>
+ </collection>
+ <collection id="fontsupport" name="Font Support" level="generic">
+ <component id="fontprovider" filter="s60" name="Font Provider">
+ <unit bldFile="fontsupport/fontprovider/group"/>
+ </component>
+ <component id="fontutils" filter="s60" name="Font Utils">
+ <unit bldFile="fontsupport/fontutils/group"/>
+ </component>
+ </collection>
+ <collection id="helpthemes" name="Help Themes" level="data">
+ <!-- collection is really a component. Need to move down a directory -->
+ <component id="helpthemes_build" filter="s60" name="Help Themes Build" class="config">
+ <unit bldFile="helpthemes/group"/>
+ </component>
+ </collection>
+ </package>
+</SystemDefinition>
\ No newline at end of file
--- a/symbian3/mw/uitools/package_definition.xml Fri Feb 12 16:37:22 2010 +0000
+++ b/symbian3/mw/uitools/package_definition.xml Mon Feb 15 18:25:55 2010 +0000
@@ -1,109 +1,134 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE SystemDefinition [
- <!ELEMENT SystemDefinition (systemModel?,SystemBuild?)>
- <!ATTLIST SystemDefinition
- name CDATA #REQUIRED
- schema CDATA #REQUIRED>
- <!ELEMENT systemModel (layer+)>
- <!ELEMENT layer (block*|collection*)*>
- <!ATTLIST layer
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED
- levels NMTOKENS #IMPLIED
- span CDATA #IMPLIED>
- <!ELEMENT block (subblock*|collection*)*>
- <!ATTLIST block
- levels NMTOKENS #IMPLIED
- span CDATA #IMPLIED
- level NMTOKEN #IMPLIED
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED>
- <!ELEMENT subblock (collection)*>
- <!ATTLIST subblock
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED>
- <!ELEMENT collection (component)*>
- <!ATTLIST collection
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED
- level NMTOKEN #IMPLIED>
- <!ELEMENT component (unit)*>
- <!ATTLIST component
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED
- deprecated CDATA #IMPLIED
- introduced CDATA #IMPLIED
- contract CDATA #IMPLIED
- plugin (Y|N) 'N'
- filter CDATA #IMPLIED
- class NMTOKENS #IMPLIED
- supports CDATA #IMPLIED
- purpose (optional|mandatory|development) 'optional'>
- <!ELEMENT unit EMPTY>
- <!ATTLIST unit
- mrp CDATA #IMPLIED
- filter CDATA #IMPLIED
- bldFile CDATA #IMPLIED
- root CDATA #IMPLIED
- version NMTOKEN #IMPLIED
- prebuilt NMTOKEN #IMPLIED
- late (Y|N) #IMPLIED
- priority CDATA #IMPLIED>
- <!ELEMENT SystemBuild (option*|target+|targetList+|list+|configuration+)*>
- <!ATTLIST SystemBuild schema CDATA #REQUIRED>
- <!ELEMENT list (ref+)>
- <!ATTLIST list
- name ID #REQUIRED
- description CDATA #REQUIRED>
- <!ELEMENT ref EMPTY>
- <!ATTLIST ref item CDATA #REQUIRED>
- <!ELEMENT targetList EMPTY>
- <!ATTLIST targetList
- name ID #REQUIRED
- description CDATA #REQUIRED
- target IDREFS #REQUIRED>
- <!ELEMENT target EMPTY>
- <!ATTLIST target
- name ID #REQUIRED
- abldTarget CDATA #REQUIRED
- description CDATA #REQUIRED>
- <!ELEMENT option EMPTY>
- <!ATTLIST option
- name ID #REQUIRED
- abldOption CDATA #REQUIRED
- description CDATA #REQUIRED
- enable (Y|N) #REQUIRED>
- <!ELEMENT configuration (listRef+|ref+|task+)*>
- <!ATTLIST configuration
- name ID #REQUIRED
- description CDATA #REQUIRED
- filter CDATA #REQUIRED>
- <!ELEMENT task (listRef*,(buildLayer|specialInstructions))>
- <!ELEMENT listRef EMPTY>
- <!ATTLIST listRef list CDATA #REQUIRED>
- <!ELEMENT buildLayer EMPTY>
- <!ATTLIST buildLayer
- command CDATA #REQUIRED
- targetList IDREFS #IMPLIED
- unitParallel (Y|N) #REQUIRED
- targetParallel (Y|N) 'N'>
- <!ELEMENT specialInstructions EMPTY>
- <!ATTLIST specialInstructions
- name CDATA #REQUIRED
- cwd CDATA #REQUIRED
- root CDATA #IMPLIED
- command CDATA #REQUIRED>
-]>
-<SystemDefinition schema="2.0.1" name="Symbian^3">
-<systemModel>
-<layer name="mw">
-<block name="uitools">
-<collection name="s60">
-<component name="uitools">
-<unit bldFile="/sf/mw/uitools/group" mrp=""/>
-</component>
-</collection>
-</block>
-</layer>
-</systemModel>
+<!DOCTYPE SystemDefinition [
+<!ELEMENT SystemDefinition ( systemModel )>
+<!ATTLIST SystemDefinition
+ name CDATA #REQUIRED
+ schema CDATA #REQUIRED
+>
+<!-- all paths are relative to the environment variable specified by the root attribute, or SOURCEROOT if not. -->
+
+<!-- System Model Section of DTD -->
+<!ELEMENT systemModel (layer+)>
+
+<!ELEMENT layer (block* | collection*)*>
+<!-- Kernel Services, Base Services, OS Services, Etc -->
+<!ATTLIST layer
+ name CDATA #REQUIRED
+ long-name CDATA #IMPLIED
+ levels NMTOKENS #IMPLIED
+ span CDATA #IMPLIED
+>
+
+<!ELEMENT block (subblock* | collection*)*>
+ <!-- Generic OS services, Comms Services, etc -->
+<!ATTLIST block
+ levels NMTOKENS #IMPLIED
+ span CDATA #IMPLIED
+ level NMTOKEN #IMPLIED
+ name CDATA #REQUIRED
+ long-name CDATA #IMPLIED
+>
+
+<!ELEMENT subblock (collection)*>
+<!-- Cellular Baseband Services, Networking Services, etc -->
+<!ATTLIST subblock
+ name CDATA #REQUIRED
+ long-name CDATA #IMPLIED
+>
+
+<!ELEMENT collection (component)*>
+<!-- Screen Driver, Content Handling, etc -->
+<!ATTLIST collection
+ name CDATA #REQUIRED
+ long-name CDATA #IMPLIED
+ level NMTOKEN #IMPLIED
+>
+
+<!ELEMENT component (unit)*>
+<!-- contains units or is a package or prebuilt -->
+<!ATTLIST component
+ name CDATA #REQUIRED
+ long-name CDATA #IMPLIED
+ deprecated CDATA #IMPLIED
+ introduced CDATA #IMPLIED
+ contract CDATA #IMPLIED
+ plugin (Y|N) "N"
+ filter CDATA #IMPLIED
+ class NMTOKENS #IMPLIED
+ supports CDATA #IMPLIED
+ purpose ( optional | mandatory | development ) "optional"
+>
+
+<!ELEMENT unit EMPTY >
+<!-- must be buildable (bld.inf) -->
+<!-- bldFile may someday be removed in favour of mrp -->
+<!ATTLIST unit
+ mrp CDATA #IMPLIED
+ filter CDATA #IMPLIED
+ bldFile CDATA #IMPLIED
+ root CDATA #IMPLIED
+ version NMTOKEN #IMPLIED
+ prebuilt NMTOKEN #IMPLIED
+ late (Y|N) #IMPLIED
+ priority CDATA #IMPLIED
+>
+]>
+<SystemDefinition name="Symbian^3" schema="2.0.1">
+ <systemModel>
+ <layer name="mw" long-name="Middleware" levels="generic specific">
+ <block name="uitools" level="specific" long-name="UI Tools" levels="compile encode tool if">
+ <collection name="cdlcompilertoolkit" long-name="CDL Compiler Toolkit" level="compile">
+ <!-- collection is actually a component. Needs to be moved down a directory -->
+ <component name="cdlcompilertoolkit_build" filter="s60" long-name="CDL Compiler Toolkit Build">
+ <unit bldFile="/sf/mw/uitools/cdlcompilertoolkit/group"/>
+ </component>
+ </collection>
+ <collection name="cdlcompiler" long-name="CDL Compiler" level="compile">
+ <!-- collection is actually a component. Needs to be moved down a directory -->
+ <component name="cdlcompiler_build" filter="s60" long-name="CDL Compiler Build">
+ <unit bldFile="/sf/mw/uitools/cdlcompiler/group"/>
+ </component>
+ </collection>
+ <collection name="gfxtools" long-name="Graphics Tools" level="tool">
+ <component name="gditools" filter="s60" long-name="GDI Tools" class="PC">
+ <unit bldFile="/sf/mw/uitools/gfxtools/gditools/group"/>
+ </component>
+ <component name="color" filter="s60" long-name="Bitmap Colour Palette" class="PC">
+ <unit bldFile="/sf/mw/uitools/gfxtools/color/group"/>
+ </component>
+ </collection>
+ <collection name="aknlayoutcompiler" long-name="Avkon Layout Compiler" level="compile">
+ <!-- collection is actually a component. Needs to be moved down a directory -->
+ <component name="aknlayoutcompiler_build" filter="s60" long-name="Avkon Layout Compiler Build">
+ <unit bldFile="/sf/mw/uitools/aknlayoutcompiler/group"/>
+ </component>
+ </collection>
+ <collection name="skincompiler" long-name="Skin Compiler" level="compile">
+ <component name="aknskindesccompiler" filter="s60" long-name="Avkon Skin Descriptor Compiler">
+ <unit bldFile="/sf/mw/uitools/skincompiler/AknSkinDescCompiler/group"/>
+ </component>
+ </collection>
+ <collection name="reszip" long-name="Resource Zip" level="encode">
+ <!-- collection is actually a component. Needs to be moved down a directory -->
+ <component name="reszip_build" filter="s60" long-name="Resource Zip Build">
+ <unit bldFile="/sf/mw/uitools/reszip/group"/>
+ </component>
+ </collection>
+ <collection name="toollibraries" long-name="Tool Libraries" level="tool"/>
+ <collection name="svgtencoder" long-name="SVGT Encoder" level="encode">
+ <component name="svgtenc" filter="s60" long-name="Standalone SVGT Encoder" class="PC">
+ <unit bldFile="/sf/mw/uitools/svgtencoder/svgtenc/standalone/group"/>
+ </component>
+ </collection>
+ <collection name="uitools_info" long-name="UI Tools Info" level="if">
+ <component name="uitools_plat" filter="s60" long-name="UI Tools Platform Interfaces" class="api">
+ <unit bldFile="/sf/mw/uitools/uitools_plat/group"/>
+ </component>
+ <component name="uitools_pub" filter="s60" long-name="UI Tools Public Interfaces" class="api">
+ <unit bldFile="/sf/mw/uitools/uitools_pub/group"/>
+ </component>
+ </collection>
+ </block>
+ </layer>
+ </systemModel>
</SystemDefinition>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/symbian3/mw/uitools/package_definition_3.0.xml Mon Feb 15 18:25:55 2010 +0000
@@ -0,0 +1,56 @@
+<?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"/>
+ </component>
+ <component id="color" filter="s60" name="Bitmap Colour Palette" target="desktop">
+ <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="Standalone SVGT Encoder" target="desktop">
+ <unit bldFile="svgtencoder/svgtenc/standalone/group"/>
+ </component>
+ </collection>
+ <collection id="uitools_info" name="UI Tools Info" level="if">
+ <component id="uitools_plat" filter="s60" name="UI Tools Platform Interfaces" class="api">
+ <unit bldFile="uitools_plat/group"/>
+ </component>
+ <component id="uitools_pub" filter="s60" name="UI Tools Public Interfaces" class="api">
+ <unit bldFile="uitools_pub/group"/>
+ </component>
+ </collection>
+ </package>
+</SystemDefinition>
--- a/symbian3/mw/usbservices/package_definition.xml Fri Feb 12 16:37:22 2010 +0000
+++ b/symbian3/mw/usbservices/package_definition.xml Mon Feb 15 18:25:55 2010 +0000
@@ -1,109 +1,152 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE SystemDefinition [
- <!ELEMENT SystemDefinition (systemModel?,SystemBuild?)>
- <!ATTLIST SystemDefinition
- name CDATA #REQUIRED
- schema CDATA #REQUIRED>
- <!ELEMENT systemModel (layer+)>
- <!ELEMENT layer (block*|collection*)*>
- <!ATTLIST layer
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED
- levels NMTOKENS #IMPLIED
- span CDATA #IMPLIED>
- <!ELEMENT block (subblock*|collection*)*>
- <!ATTLIST block
- levels NMTOKENS #IMPLIED
- span CDATA #IMPLIED
- level NMTOKEN #IMPLIED
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED>
- <!ELEMENT subblock (collection)*>
- <!ATTLIST subblock
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED>
- <!ELEMENT collection (component)*>
- <!ATTLIST collection
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED
- level NMTOKEN #IMPLIED>
- <!ELEMENT component (unit)*>
- <!ATTLIST component
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED
- deprecated CDATA #IMPLIED
- introduced CDATA #IMPLIED
- contract CDATA #IMPLIED
- plugin (Y|N) 'N'
- filter CDATA #IMPLIED
- class NMTOKENS #IMPLIED
- supports CDATA #IMPLIED
- purpose (optional|mandatory|development) 'optional'>
- <!ELEMENT unit EMPTY>
- <!ATTLIST unit
- mrp CDATA #IMPLIED
- filter CDATA #IMPLIED
- bldFile CDATA #IMPLIED
- root CDATA #IMPLIED
- version NMTOKEN #IMPLIED
- prebuilt NMTOKEN #IMPLIED
- late (Y|N) #IMPLIED
- priority CDATA #IMPLIED>
- <!ELEMENT SystemBuild (option*|target+|targetList+|list+|configuration+)*>
- <!ATTLIST SystemBuild schema CDATA #REQUIRED>
- <!ELEMENT list (ref+)>
- <!ATTLIST list
- name ID #REQUIRED
- description CDATA #REQUIRED>
- <!ELEMENT ref EMPTY>
- <!ATTLIST ref item CDATA #REQUIRED>
- <!ELEMENT targetList EMPTY>
- <!ATTLIST targetList
- name ID #REQUIRED
- description CDATA #REQUIRED
- target IDREFS #REQUIRED>
- <!ELEMENT target EMPTY>
- <!ATTLIST target
- name ID #REQUIRED
- abldTarget CDATA #REQUIRED
- description CDATA #REQUIRED>
- <!ELEMENT option EMPTY>
- <!ATTLIST option
- name ID #REQUIRED
- abldOption CDATA #REQUIRED
- description CDATA #REQUIRED
- enable (Y|N) #REQUIRED>
- <!ELEMENT configuration (listRef+|ref+|task+)*>
- <!ATTLIST configuration
- name ID #REQUIRED
- description CDATA #REQUIRED
- filter CDATA #REQUIRED>
- <!ELEMENT task (listRef*,(buildLayer|specialInstructions))>
- <!ELEMENT listRef EMPTY>
- <!ATTLIST listRef list CDATA #REQUIRED>
- <!ELEMENT buildLayer EMPTY>
- <!ATTLIST buildLayer
- command CDATA #REQUIRED
- targetList IDREFS #IMPLIED
- unitParallel (Y|N) #REQUIRED
- targetParallel (Y|N) 'N'>
- <!ELEMENT specialInstructions EMPTY>
- <!ATTLIST specialInstructions
- name CDATA #REQUIRED
- cwd CDATA #REQUIRED
- root CDATA #IMPLIED
- command CDATA #REQUIRED>
-]>
-<SystemDefinition schema="2.0.1" name="Symbian^3">
-<systemModel>
-<layer name="mw">
-<block name="usbservices">
-<collection name="s60">
-<component name="usbservices">
-<unit bldFile="/sf/mw/usbservices/group" mrp=""/>
-</component>
-</collection>
-</block>
-</layer>
-</systemModel>
+<!DOCTYPE SystemDefinition [
+<!ELEMENT SystemDefinition ( systemModel )>
+<!ATTLIST SystemDefinition
+ name CDATA #REQUIRED
+ schema CDATA #REQUIRED
+>
+<!-- all paths are relative to the environment variable specified by the root attribute, or SOURCEROOT if not. -->
+
+<!-- System Model Section of DTD -->
+<!ELEMENT systemModel (layer+)>
+
+<!ELEMENT layer (block* | collection*)*>
+<!-- Kernel Services, Base Services, OS Services, Etc -->
+<!ATTLIST layer
+ name CDATA #REQUIRED
+ long-name CDATA #IMPLIED
+ levels NMTOKENS #IMPLIED
+ span CDATA #IMPLIED
+>
+
+<!ELEMENT block (subblock* | collection*)*>
+ <!-- Generic OS services, Comms Services, etc -->
+<!ATTLIST block
+ levels NMTOKENS #IMPLIED
+ span CDATA #IMPLIED
+ level NMTOKEN #IMPLIED
+ name CDATA #REQUIRED
+ long-name CDATA #IMPLIED
+>
+
+<!ELEMENT subblock (collection)*>
+<!-- Cellular Baseband Services, Networking Services, etc -->
+<!ATTLIST subblock
+ name CDATA #REQUIRED
+ long-name CDATA #IMPLIED
+>
+
+<!ELEMENT collection (component)*>
+<!-- Screen Driver, Content Handling, etc -->
+<!ATTLIST collection
+ name CDATA #REQUIRED
+ long-name CDATA #IMPLIED
+ level NMTOKEN #IMPLIED
+>
+
+<!ELEMENT component (unit)*>
+<!-- contains units or is a package or prebuilt -->
+<!ATTLIST component
+ name CDATA #REQUIRED
+ long-name CDATA #IMPLIED
+ deprecated CDATA #IMPLIED
+ introduced CDATA #IMPLIED
+ contract CDATA #IMPLIED
+ plugin (Y|N) "N"
+ filter CDATA #IMPLIED
+ class NMTOKENS #IMPLIED
+ supports CDATA #IMPLIED
+ purpose ( optional | mandatory | development ) "optional"
+>
+
+<!ELEMENT unit EMPTY >
+<!-- must be buildable (bld.inf) -->
+<!-- bldFile may someday be removed in favour of mrp -->
+<!ATTLIST unit
+ mrp CDATA #IMPLIED
+ filter CDATA #IMPLIED
+ bldFile CDATA #IMPLIED
+ root CDATA #IMPLIED
+ version NMTOKEN #IMPLIED
+ prebuilt NMTOKEN #IMPLIED
+ late (Y|N) #IMPLIED
+ priority CDATA #IMPLIED
+>
+]>
+<SystemDefinition name="Symbian^3" schema="2.0.1">
+ <systemModel>
+ <layer name="mw" long-name="Middleware" levels="generic specific">
+ <block name="usbservices" level="generic" long-name="USB Services" levels="framework server generic specific plugin">
+ <collection name="usbservices_info" long-name="USB Services Info" level="plugin">
+ <component name="usbservices_plat" filter="s60" long-name="USB Services Platform Interfaces" class="api">
+ <unit bldFile="/sf/mw/usbservices/usbservices_plat/group"/>
+ </component>
+ <component name="usbservices_test" filter="s60,api_test" long-name="USB Services Tests">
+ <unit bldFile="/sf/mw/usbservices/tsrc/group"/>
+ </component>
+ </collection>
+ <collection name="usbengines" long-name="USB Engines" level="generic">
+ <component name="usbotgwatcher" filter="s60" long-name="USB OTG Watcher">
+ <unit bldFile="/sf/mw/usbservices/usbengines/usbotgwatcher/group"/>
+ </component>
+ <component name="usbwatcher" filter="s60" long-name="USB Watcher">
+ <unit bldFile="/sf/mw/usbservices/usbengines/usbwatcher/group"/>
+ </component>
+ <component name="usblocodplugin" filter="s60" long-name="USB Local Connectivity Domain Plugin" plugin="Y">
+ <unit bldFile="/sf/mw/usbservices/usbengines/usblocodplugin/group"/>
+ </component>
+ <component name="usbdevcon" filter="s60" long-name="USB Device Control">
+ <unit bldFile="/sf/mw/usbservices/usbengines/usbdevcon/group"/>
+ </component>
+ <component name="usbremotepersonality" filter="s60" long-name="USB Remote Personality">
+ <unit bldFile="/sf/mw/usbservices/usbengines/usbremotepersonality/group"/>
+ </component>
+ </collection>
+ <collection name="usbclasses" long-name="USB Classes" level="framework">
+ <component name="usbobexclasscontroller" filter="s60" long-name="USB OBEX Class Controller" plugin="Y">
+ <unit bldFile="/sf/mw/usbservices/usbclasses/usbobexclasscontroller/group"/>
+ </component>
+ <component name="usbbasicpersonality" filter="s60" long-name="USB Basic Personality" plugin="Y">
+ <unit bldFile="/sf/mw/usbservices/usbclasses/usbbasicpersonality/group"/>
+ </component>
+ <component name="usbmscpersonality" filter="s60" long-name="USB MSC Personality" plugin="Y">
+ <unit bldFile="/sf/mw/usbservices/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 name="pictbridgeengine" filter="s60" long-name="PictBridge Engine">
+ <unit bldFile="/sf/mw/usbservices/usbclasses/pictbridgeengine/group"/>
+ </component>
+ <component name="usbphoneasmodem" filter="s60" long-name="USB Phone as Modem" introduced="^3">
+ <unit bldFile="/sf/mw/usbservices/usbclasses/usbphoneasmodem/group"/>
+ </component>
+ </collection>
+ <collection name="usbuis" long-name="USB UIs" level="specific">
+ <component name="usbui" filter="s60" long-name="USB UI">
+ <unit bldFile="/sf/mw/usbservices/usbuis/usbui/group"/>
+ </component>
+ <component name="usbuinotif" filter="s60" long-name="USB UI Notifiers">
+ <unit bldFile="/sf/mw/usbservices/usbuis/usbuinotif/group"/>
+ </component>
+ <component name="imageprintuiprovider" filter="s60" long-name="ImagePrint UI Provider" plugin="Y">
+ <unit bldFile="/sf/mw/usbservices/usbuis/imageprintuiprovider/group"/>
+ </component>
+ <component name="usbimageprintui" filter="s60" long-name="ImagePrint UI">
+ <unit bldFile="/sf/mw/usbservices/usbuis/imageprintui/group"/>
+ </component>
+ <component name="rndisui" filter="s60" long-name="Remote NDIS UI" introduced="^3">
+ <unit bldFile="/sf/mw/usbservices/usbuis/rndisui/group"/>
+ </component>
+ </collection>
+ </block>
+ </layer>
+ </systemModel>
</SystemDefinition>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/symbian3/mw/usbservices/package_definition_3.0.xml Mon Feb 15 18:25:55 2010 +0000
@@ -0,0 +1,74 @@
+<?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="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="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"/>
+ </component>
+ <component id="usbdevcon" filter="s60" name="USB Device Control">
+ <unit bldFile="usbengines/usbdevcon/group"/>
+ </component>
+ <component id="usbremotepersonality" filter="s60" name="USB Remote Personality">
+ <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"/>
+ </component>
+ <component id="usbuinotif" filter="s60" name="USB UI Notifiers">
+ <unit bldFile="usbuis/usbuinotif/group"/>
+ </component>
+ <component id="imageprintuiprovider" filter="s60" name="ImagePrint UI Provider" class="plugin">
+ <unit bldFile="usbuis/imageprintuiprovider/group"/>
+ </component>
+ <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.xml Fri Feb 12 16:37:22 2010 +0000
+++ b/symbian3/mw/videoutils/package_definition.xml Mon Feb 15 18:25:55 2010 +0000
@@ -1,109 +1,107 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE SystemDefinition [
- <!ELEMENT SystemDefinition (systemModel?,SystemBuild?)>
- <!ATTLIST SystemDefinition
- name CDATA #REQUIRED
- schema CDATA #REQUIRED>
- <!ELEMENT systemModel (layer+)>
- <!ELEMENT layer (block*|collection*)*>
- <!ATTLIST layer
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED
- levels NMTOKENS #IMPLIED
- span CDATA #IMPLIED>
- <!ELEMENT block (subblock*|collection*)*>
- <!ATTLIST block
- levels NMTOKENS #IMPLIED
- span CDATA #IMPLIED
- level NMTOKEN #IMPLIED
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED>
- <!ELEMENT subblock (collection)*>
- <!ATTLIST subblock
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED>
- <!ELEMENT collection (component)*>
- <!ATTLIST collection
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED
- level NMTOKEN #IMPLIED>
- <!ELEMENT component (unit)*>
- <!ATTLIST component
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED
- deprecated CDATA #IMPLIED
- introduced CDATA #IMPLIED
- contract CDATA #IMPLIED
- plugin (Y|N) 'N'
- filter CDATA #IMPLIED
- class NMTOKENS #IMPLIED
- supports CDATA #IMPLIED
- purpose (optional|mandatory|development) 'optional'>
- <!ELEMENT unit EMPTY>
- <!ATTLIST unit
- mrp CDATA #IMPLIED
- filter CDATA #IMPLIED
- bldFile CDATA #IMPLIED
- root CDATA #IMPLIED
- version NMTOKEN #IMPLIED
- prebuilt NMTOKEN #IMPLIED
- late (Y|N) #IMPLIED
- priority CDATA #IMPLIED>
- <!ELEMENT SystemBuild (option*|target+|targetList+|list+|configuration+)*>
- <!ATTLIST SystemBuild schema CDATA #REQUIRED>
- <!ELEMENT list (ref+)>
- <!ATTLIST list
- name ID #REQUIRED
- description CDATA #REQUIRED>
- <!ELEMENT ref EMPTY>
- <!ATTLIST ref item CDATA #REQUIRED>
- <!ELEMENT targetList EMPTY>
- <!ATTLIST targetList
- name ID #REQUIRED
- description CDATA #REQUIRED
- target IDREFS #REQUIRED>
- <!ELEMENT target EMPTY>
- <!ATTLIST target
- name ID #REQUIRED
- abldTarget CDATA #REQUIRED
- description CDATA #REQUIRED>
- <!ELEMENT option EMPTY>
- <!ATTLIST option
- name ID #REQUIRED
- abldOption CDATA #REQUIRED
- description CDATA #REQUIRED
- enable (Y|N) #REQUIRED>
- <!ELEMENT configuration (listRef+|ref+|task+)*>
- <!ATTLIST configuration
- name ID #REQUIRED
- description CDATA #REQUIRED
- filter CDATA #REQUIRED>
- <!ELEMENT task (listRef*,(buildLayer|specialInstructions))>
- <!ELEMENT listRef EMPTY>
- <!ATTLIST listRef list CDATA #REQUIRED>
- <!ELEMENT buildLayer EMPTY>
- <!ATTLIST buildLayer
- command CDATA #REQUIRED
- targetList IDREFS #IMPLIED
- unitParallel (Y|N) #REQUIRED
- targetParallel (Y|N) 'N'>
- <!ELEMENT specialInstructions EMPTY>
- <!ATTLIST specialInstructions
- name CDATA #REQUIRED
- cwd CDATA #REQUIRED
- root CDATA #IMPLIED
- command CDATA #REQUIRED>
-]>
-<SystemDefinition schema="2.0.1" name="Symbian^3">
-<systemModel>
-<layer name="mw">
-<block name="videoutils">
-<collection name="s60">
-<component name="videoutils">
-<unit bldFile="/sf/mw/videoutils/group" mrp=""/>
-</component>
-</collection>
-</block>
-</layer>
-</systemModel>
+<!DOCTYPE SystemDefinition [
+<!ELEMENT SystemDefinition ( systemModel )>
+<!ATTLIST SystemDefinition
+ name CDATA #REQUIRED
+ schema CDATA #REQUIRED
+>
+<!-- all paths are relative to the environment variable specified by the root attribute, or SOURCEROOT if not. -->
+
+<!-- System Model Section of DTD -->
+<!ELEMENT systemModel (layer+)>
+
+<!ELEMENT layer (block* | collection*)*>
+<!-- Kernel Services, Base Services, OS Services, Etc -->
+<!ATTLIST layer
+ name CDATA #REQUIRED
+ long-name CDATA #IMPLIED
+ levels NMTOKENS #IMPLIED
+ span CDATA #IMPLIED
+>
+
+<!ELEMENT block (subblock* | collection*)*>
+ <!-- Generic OS services, Comms Services, etc -->
+<!ATTLIST block
+ levels NMTOKENS #IMPLIED
+ span CDATA #IMPLIED
+ level NMTOKEN #IMPLIED
+ name CDATA #REQUIRED
+ long-name CDATA #IMPLIED
+>
+
+<!ELEMENT subblock (collection)*>
+<!-- Cellular Baseband Services, Networking Services, etc -->
+<!ATTLIST subblock
+ name CDATA #REQUIRED
+ long-name CDATA #IMPLIED
+>
+
+<!ELEMENT collection (component)*>
+<!-- Screen Driver, Content Handling, etc -->
+<!ATTLIST collection
+ name CDATA #REQUIRED
+ long-name CDATA #IMPLIED
+ level NMTOKEN #IMPLIED
+>
+
+<!ELEMENT component (unit)*>
+<!-- contains units or is a package or prebuilt -->
+<!ATTLIST component
+ name CDATA #REQUIRED
+ long-name CDATA #IMPLIED
+ deprecated CDATA #IMPLIED
+ introduced CDATA #IMPLIED
+ contract CDATA #IMPLIED
+ plugin (Y|N) "N"
+ filter CDATA #IMPLIED
+ class NMTOKENS #IMPLIED
+ supports CDATA #IMPLIED
+ purpose ( optional | mandatory | development ) "optional"
+>
+
+<!ELEMENT unit EMPTY >
+<!-- must be buildable (bld.inf) -->
+<!-- bldFile may someday be removed in favour of mrp -->
+<!ATTLIST unit
+ mrp CDATA #IMPLIED
+ filter CDATA #IMPLIED
+ bldFile CDATA #IMPLIED
+ root CDATA #IMPLIED
+ version NMTOKEN #IMPLIED
+ prebuilt NMTOKEN #IMPLIED
+ late (Y|N) #IMPLIED
+ priority CDATA #IMPLIED
+>
+]>
+<SystemDefinition name="Symbian^3" schema="2.0.1">
+ <systemModel>
+ <layer name="mw" long-name="Middleware" levels="generic specific">
+ <block name="videoutils" level="specific" long-name="Video Utils" levels="eng util if">
+ <collection name="videoscheduler" long-name="Video Scheduler" level="util">
+ <component name="schedulerclient" filter="s60" long-name="Video Scheduler Client">
+ <unit bldFile="/sf/mw/videoutils/videoscheduler/schedulerclient/group"/>
+ </component>
+ <component name="schedulerserver" filter="s60" long-name="Video Scheduler Server">
+ <unit bldFile="/sf/mw/videoutils/videoscheduler/schedulerserver/group"/>
+ </component>
+ </collection>
+ <collection name="videoconnutility" long-name="Video Connection Utility" level="util">
+ <component name="connutilpsworker" filter="s60" long-name="Connection Utility Publish and Subscribe Worker">
+ <unit bldFile="/sf/mw/videoutils/videoconnutility/connutilpsworker/group"/>
+ </component>
+ <component name="video_connutility" filter="s60" long-name="Video Connection Utility">
+ <unit bldFile="/sf/mw/videoutils/videoconnutility/connutility/group"/>
+ </component>
+ </collection>
+ <collection name="videoutils_info" long-name="Video Utils Info" level="if">
+ <component name="videoutils_plat" filter="s60" long-name="Video Utils Platform Interfaces" class="api">
+ <unit bldFile="/sf/mw/videoutils/videoutils_plat/group"/>
+ </component>
+ <component name="videoutils_test" filter="s60,api_test" long-name="Video Utils Tests">
+ <unit bldFile="/sf/mw/videoutils/tsrc/group"/>
+ </component>
+ </collection>
+ </block>
+ </layer>
+ </systemModel>
</SystemDefinition>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/symbian3/mw/videoutils/package_definition_3.0.xml Mon Feb 15 18:25:55 2010 +0000
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<SystemDefinition schema="3.0.0">
+ <package id="videoutils" name="Video Utils" levels="eng util if">
+ <collection id="videoscheduler" name="Video Scheduler" level="util">
+ <component id="schedulerclient" filter="s60" name="Video Scheduler Client">
+ <unit bldFile="videoscheduler/schedulerclient/group"/>
+ </component>
+ <component id="schedulerserver" filter="s60" name="Video Scheduler Server">
+ <unit bldFile="videoscheduler/schedulerserver/group"/>
+ </component>
+ </collection>
+ <collection id="videoconnutility" name="Video Connection Utility" level="util">
+ <component id="connutilpsworker" filter="s60" name="Connection Utility Publish and Subscribe Worker">
+ <unit bldFile="videoconnutility/connutilpsworker/group"/>
+ </component>
+ <component id="video_connutility" filter="s60" name="Video Connection Utility">
+ <unit bldFile="videoconnutility/connutility/group"/>
+ </component>
+ </collection>
+ <collection id="videoutils_info" name="Video Utils Info" level="if">
+ <component id="videoutils_plat" filter="s60" name="Video Utils Platform Interfaces" class="api">
+ <unit bldFile="videoutils_plat/group"/>
+ </component>
+ <component id="videoutils_test" filter="s60,api_test" name="Video Utils Tests">
+ <unit bldFile="tsrc/group"/>
+ </component>
+ </collection>
+ </package>
+</SystemDefinition>
--- a/symbian3/mw/vpnclient/package_definition.xml Fri Feb 12 16:37:22 2010 +0000
+++ b/symbian3/mw/vpnclient/package_definition.xml Mon Feb 15 18:25:55 2010 +0000
@@ -1,109 +1,207 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE SystemDefinition [
- <!ELEMENT SystemDefinition (systemModel?,SystemBuild?)>
- <!ATTLIST SystemDefinition
- name CDATA #REQUIRED
- schema CDATA #REQUIRED>
- <!ELEMENT systemModel (layer+)>
- <!ELEMENT layer (block*|collection*)*>
- <!ATTLIST layer
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED
- levels NMTOKENS #IMPLIED
- span CDATA #IMPLIED>
- <!ELEMENT block (subblock*|collection*)*>
- <!ATTLIST block
- levels NMTOKENS #IMPLIED
- span CDATA #IMPLIED
- level NMTOKEN #IMPLIED
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED>
- <!ELEMENT subblock (collection)*>
- <!ATTLIST subblock
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED>
- <!ELEMENT collection (component)*>
- <!ATTLIST collection
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED
- level NMTOKEN #IMPLIED>
- <!ELEMENT component (unit)*>
- <!ATTLIST component
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED
- deprecated CDATA #IMPLIED
- introduced CDATA #IMPLIED
- contract CDATA #IMPLIED
- plugin (Y|N) 'N'
- filter CDATA #IMPLIED
- class NMTOKENS #IMPLIED
- supports CDATA #IMPLIED
- purpose (optional|mandatory|development) 'optional'>
- <!ELEMENT unit EMPTY>
- <!ATTLIST unit
- mrp CDATA #IMPLIED
- filter CDATA #IMPLIED
- bldFile CDATA #IMPLIED
- root CDATA #IMPLIED
- version NMTOKEN #IMPLIED
- prebuilt NMTOKEN #IMPLIED
- late (Y|N) #IMPLIED
- priority CDATA #IMPLIED>
- <!ELEMENT SystemBuild (option*|target+|targetList+|list+|configuration+)*>
- <!ATTLIST SystemBuild schema CDATA #REQUIRED>
- <!ELEMENT list (ref+)>
- <!ATTLIST list
- name ID #REQUIRED
- description CDATA #REQUIRED>
- <!ELEMENT ref EMPTY>
- <!ATTLIST ref item CDATA #REQUIRED>
- <!ELEMENT targetList EMPTY>
- <!ATTLIST targetList
- name ID #REQUIRED
- description CDATA #REQUIRED
- target IDREFS #REQUIRED>
- <!ELEMENT target EMPTY>
- <!ATTLIST target
- name ID #REQUIRED
- abldTarget CDATA #REQUIRED
- description CDATA #REQUIRED>
- <!ELEMENT option EMPTY>
- <!ATTLIST option
- name ID #REQUIRED
- abldOption CDATA #REQUIRED
- description CDATA #REQUIRED
- enable (Y|N) #REQUIRED>
- <!ELEMENT configuration (listRef+|ref+|task+)*>
- <!ATTLIST configuration
- name ID #REQUIRED
- description CDATA #REQUIRED
- filter CDATA #REQUIRED>
- <!ELEMENT task (listRef*,(buildLayer|specialInstructions))>
- <!ELEMENT listRef EMPTY>
- <!ATTLIST listRef list CDATA #REQUIRED>
- <!ELEMENT buildLayer EMPTY>
- <!ATTLIST buildLayer
- command CDATA #REQUIRED
- targetList IDREFS #IMPLIED
- unitParallel (Y|N) #REQUIRED
- targetParallel (Y|N) 'N'>
- <!ELEMENT specialInstructions EMPTY>
- <!ATTLIST specialInstructions
- name CDATA #REQUIRED
- cwd CDATA #REQUIRED
- root CDATA #IMPLIED
- command CDATA #REQUIRED>
-]>
-<SystemDefinition schema="2.0.1" name="Symbian^3">
-<systemModel>
-<layer name="mw">
-<block name="vpnclient">
-<collection name="s60">
-<component name="vpnclient">
-<unit bldFile="/sf/mw/vpnclient/group" mrp=""/>
-</component>
-</collection>
-</block>
-</layer>
-</systemModel>
+<!DOCTYPE SystemDefinition [
+<!ELEMENT SystemDefinition ( systemModel )>
+<!ATTLIST SystemDefinition
+ name CDATA #REQUIRED
+ schema CDATA #REQUIRED
+>
+<!-- all paths are relative to the environment variable specified by the root attribute, or SOURCEROOT if not. -->
+
+<!-- System Model Section of DTD -->
+<!ELEMENT systemModel (layer+)>
+
+<!ELEMENT layer (block* | collection*)*>
+<!-- Kernel Services, Base Services, OS Services, Etc -->
+<!ATTLIST layer
+ name CDATA #REQUIRED
+ long-name CDATA #IMPLIED
+ levels NMTOKENS #IMPLIED
+ span CDATA #IMPLIED
+>
+
+<!ELEMENT block (subblock* | collection*)*>
+ <!-- Generic OS services, Comms Services, etc -->
+<!ATTLIST block
+ levels NMTOKENS #IMPLIED
+ span CDATA #IMPLIED
+ level NMTOKEN #IMPLIED
+ name CDATA #REQUIRED
+ long-name CDATA #IMPLIED
+>
+
+<!ELEMENT subblock (collection)*>
+<!-- Cellular Baseband Services, Networking Services, etc -->
+<!ATTLIST subblock
+ name CDATA #REQUIRED
+ long-name CDATA #IMPLIED
+>
+
+<!ELEMENT collection (component)*>
+<!-- Screen Driver, Content Handling, etc -->
+<!ATTLIST collection
+ name CDATA #REQUIRED
+ long-name CDATA #IMPLIED
+ level NMTOKEN #IMPLIED
+>
+
+<!ELEMENT component (unit)*>
+<!-- contains units or is a package or prebuilt -->
+<!ATTLIST component
+ name CDATA #REQUIRED
+ long-name CDATA #IMPLIED
+ deprecated CDATA #IMPLIED
+ introduced CDATA #IMPLIED
+ contract CDATA #IMPLIED
+ plugin (Y|N) "N"
+ filter CDATA #IMPLIED
+ class NMTOKENS #IMPLIED
+ supports CDATA #IMPLIED
+ purpose ( optional | mandatory | development ) "optional"
+>
+
+<!ELEMENT unit EMPTY >
+<!-- must be buildable (bld.inf) -->
+<!-- bldFile may someday be removed in favour of mrp -->
+<!ATTLIST unit
+ mrp CDATA #IMPLIED
+ filter CDATA #IMPLIED
+ bldFile CDATA #IMPLIED
+ root CDATA #IMPLIED
+ version NMTOKEN #IMPLIED
+ prebuilt NMTOKEN #IMPLIED
+ late (Y|N) #IMPLIED
+ priority CDATA #IMPLIED
+>
+]>
+<SystemDefinition name="Symbian^3" schema="2.0.1">
+ <systemModel>
+ <layer name="mw" long-name="Middleware" levels="generic specific">
+ <block name="vpnclient" level="specific" long-name="VPN Client" levels="engine ui api">
+ <!-- is the !oem_build filter needed? -->
+ <collection name="vpnapiimpl" long-name="VPN API Implementation" level="api">
+ <component name="vpnapi" filter="s60" long-name="VPN API">
+ <unit bldFile="/sf/mw/vpnclient/vpnapiimpl/group" filter="!oem_build"/>
+ </component>
+ </collection>
+ <collection name="vpnengine" long-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 name="eventmediatorapi" filter="s60" long-name="Event Mediator API">
+ <unit bldFile="/sf/mw/vpnclient/vpnengine/eventmediatorapi/group" filter="!oem_build"/>
+ </component>
+ <component name="eventviewer" filter="s60" long-name="Event Viewer">
+ <unit bldFile="/sf/mw/vpnclient/vpnengine/eventviewer/group" filter="!oem_build"/>
+ </component>
+ <component name="vpnins" filter="s60" long-name="VPN Installer">
+ <unit bldFile="/sf/mw/vpnclient/vpnengine/vpnins/group" filter="!oem_build"/>
+ </component>
+ <component name="ikepolparser" filter="s60" long-name="IKE Policy Parser">
+ <unit bldFile="/sf/mw/vpnclient/vpnengine/ikepolparser/group" filter="!oem_build"/>
+ </component>
+ <component name="utlbase64" filter="s60" long-name="Base64 Utilities">
+ <unit bldFile="/sf/mw/vpnclient/vpnengine/utlbase64/group" filter="!oem_build"/>
+ </component>
+ <component name="utlcrypto" filter="s60" long-name="Crypto Utilities">
+ <unit bldFile="/sf/mw/vpnclient/vpnengine/utlcrypto/group" filter="!oem_build"/>
+ </component>
+ <component name="utlxml" filter="s60" long-name="XML Utilities">
+ <unit bldFile="/sf/mw/vpnclient/vpnengine/utlxml/group" filter="!oem_build"/>
+ </component>
+ <component name="utlpkcs10" filter="s60" long-name="PKCS#10 Utilities">
+ <unit bldFile="/sf/mw/vpnclient/vpnengine/utlpkcs10/group" filter="!oem_build"/>
+ </component>
+ <component name="pkiserviceapi" filter="s60" long-name="PKI Service API">
+ <unit bldFile="/sf/mw/vpnclient/vpnengine/pkiserviceapi/group" filter="!oem_build"/>
+ </component>
+ <component name="ikecert" filter="s60" long-name="IKE Certificate Management">
+ <unit bldFile="/sf/mw/vpnclient/vpnengine/ikecert/group" filter="!oem_build"/>
+ </component>
+ <component name="kmdapi" filter="s60" long-name="Key Management Daemon API">
+ <unit bldFile="/sf/mw/vpnclient/vpnengine/kmdapi/group" filter="!oem_build"/>
+ </component>
+ <component name="kmdserver" filter="s60" long-name="Key Management Daemon Server">
+ <unit bldFile="/sf/mw/vpnclient/vpnengine/kmdserver/group" filter="!oem_build"/>
+ </component>
+ <component name="ikeutils" filter="s60" long-name="Internet Key Exchange Utils">
+ <unit bldFile="/sf/mw/vpnclient/vpnengine/ikeutils/group" filter="!oem_build"/>
+ </component>
+ <component name="ikev1lib" filter="s60" long-name="IKEv1 Library">
+ <unit bldFile="/sf/mw/vpnclient/vpnengine/ikev1lib/group" filter="!oem_build"/>
+ </component>
+ <component name="ikev2lib" filter="s60" long-name="IKEv2 Library">
+ <unit bldFile="/sf/mw/vpnclient/vpnengine/ikev2lib/group" filter="!oem_build"/>
+ </component>
+ <component name="vpnipsecpolparser" filter="s60" long-name="VPN IPsec Policy Parser">
+ <unit bldFile="/sf/mw/vpnclient/vpnengine/vpnipsecpolparser/group" filter="!oem_build"/>
+ </component>
+ <component name="sit" filter="s60" long-name="Socket Interaction Thread">
+ <unit bldFile="/sf/mw/vpnclient/vpnengine/sit/group" filter="!oem_build"/>
+ </component>
+ <component name="vpntcwrapper" filter="s60" long-name="VPN Terminal Control Wrapper">
+ <unit bldFile="/sf/mw/vpnclient/vpnengine/vpntcwrapper/group" filter="!oem_build"/>
+ </component>
+ <component name="eventmediator" filter="s60" long-name="Event Mediator">
+ <unit bldFile="/sf/mw/vpnclient/vpnengine/eventmediator/group" filter="!oem_build"/>
+ </component>
+ <component name="pkiservice" filter="s60" long-name="PKI Service">
+ <unit bldFile="/sf/mw/vpnclient/vpnengine/pkiservice/group" filter="!oem_build"/>
+ </component>
+ <component name="vpnconnagt" filter="s60" long-name="VPN Connection Agent">
+ <unit bldFile="/sf/mw/vpnclient/vpnengine/vpnconnagt/group" filter="!oem_build"/>
+ </component>
+ <component name="vpnmanager" filter="s60" long-name="VPN Manager">
+ <unit bldFile="/sf/mw/vpnclient/vpnengine/vpnmanager/group" filter="!oem_build"/>
+ </component>
+ <component name="vpncleaner" filter="s60" long-name="VPN Cleaner">
+ <unit bldFile="/sf/mw/vpnclient/vpnengine/vpncleaner/group" filter="!oem_build"/>
+ </component>
+ <component name="utlpkcs12" filter="s60" long-name="PKCS#12 Utilities">
+ <unit bldFile="/sf/mw/vpnclient/vpnengine/utlpkcs12/group" filter="!oem_build"/>
+ </component>
+ <component name="dmadengine" filter="s60" long-name="DM Adapter Engine">
+ <unit bldFile="/sf/mw/vpnclient/vpnengine/dmadengine/group" filter="!oem_build"/>
+ </component>
+ <component name="dmadipsecvpn" filter="s60" long-name="IPsec VPN DM Adapter" plugin="Y">
+ <unit bldFile="/sf/mw/vpnclient/vpnengine/dmadipsecvpn/group" filter="!oem_build"/>
+ </component>
+ <component name="dmadpki" filter="s60" long-name="PKI DM Adapter" plugin="Y">
+ <unit bldFile="/sf/mw/vpnclient/vpnengine/dmadpki/group" filter="!oem_build"/>
+ </component>
+ <component name="ikesocket" filter="s60" long-name="IKE Socket" introduced="^3">
+ <unit bldFile="/sf/mw/vpnclient/vpnengine/ikesocketplugin/group" filter="!oem_build"/>
+ </component>
+ </collection>
+ <collection name="vpnui" long-name="VPN UI" level="ui">
+ <component name="vpnecomnotifier" filter="s60" long-name="VPN ECOM Notifier" plugin="Y">
+ <unit bldFile="/sf/mw/vpnclient/vpnui/vpnecomnotifier/group" filter="!oem_build"/>
+ </component>
+ <component name="vpndialogmanager" filter="s60" long-name="VPN Dialog Manager">
+ <unit bldFile="/sf/mw/vpnclient/vpnui/vpndialogmanager/group" filter="!oem_build"/>
+ </component>
+ <component name="vpnmanagementui" filter="s60" long-name="VPN Management UI" plugin="Y">
+ <unit bldFile="/sf/mw/vpnclient/vpnui/vpnmanagementui/group" filter="!oem_build"/>
+ </component>
+ <component name="vpnpolins" filter="s60" long-name="VPN Policy Installer">
+ <unit bldFile="/sf/mw/vpnclient/vpnui/vpnpolins/group" filter="!oem_build"/>
+ </component>
+ <component name="vpnpolicyrecognizer" filter="s60" long-name="VPN Policy Recognizer" plugin="Y">
+ <unit bldFile="/sf/mw/vpnclient/vpnui/vpnpolicyrecognizer/group" filter="!oem_build"/>
+ </component>
+ </collection>
+ <collection name="vpnclient_info" long-name="VPN Client Info" level="api">
+ <component name="vpnclient_help" filter="s60" long-name="VPN Client Help">
+ <unit bldFile="/sf/mw/vpnclient/help/group" filter="!oem_build"/>
+ </component>
+ <component name="vpnclient_build" filter="s60" long-name="VPN Client Build">
+ <!-- should split this up into the other components and remove this-->
+ <unit bldFile="/sf/mw/vpnclient/group" filter="!oem_build"/>
+ </component>
+ <component name="vpnc_plat" filter="s60" long-name="VPN Client Platform Interfaces" class="api">
+ <unit bldFile="/sf/mw/vpnclient/vpnc_plat/vpnapi/group" filter="!oem_build"/>
+ </component>
+ </collection>
+ </block>
+ </layer>
+ </systemModel>
</SystemDefinition>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/symbian3/mw/vpnclient/package_definition_3.0.xml Mon Feb 15 18:25:55 2010 +0000
@@ -0,0 +1,132 @@
+<?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" filter="!oem_build"/>
+ </component>
+ <component id="eventviewer" filter="s60" name="Event Viewer">
+ <unit bldFile="vpnengine/eventviewer/group" filter="!oem_build"/>
+ </component>
+ <component id="vpnins" filter="s60" name="VPN Installer">
+ <unit bldFile="vpnengine/vpnins/group" filter="!oem_build"/>
+ </component>
+ <component id="ikepolparser" filter="s60" name="IKE Policy Parser">
+ <unit bldFile="vpnengine/ikepolparser/group" filter="!oem_build"/>
+ </component>
+ <component id="utlbase64" filter="s60" name="Base64 Utilities">
+ <unit bldFile="vpnengine/utlbase64/group" filter="!oem_build"/>
+ </component>
+ <component id="utlcrypto" filter="s60" name="Crypto Utilities">
+ <unit bldFile="vpnengine/utlcrypto/group" filter="!oem_build"/>
+ </component>
+ <component id="utlxml" filter="s60" name="XML Utilities">
+ <unit bldFile="vpnengine/utlxml/group" filter="!oem_build"/>
+ </component>
+ <component id="utlpkcs10" filter="s60" name="PKCS#10 Utilities">
+ <unit bldFile="vpnengine/utlpkcs10/group" filter="!oem_build"/>
+ </component>
+
+ <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" filter="!oem_build"/>
+ </component>
+ <component id="kmdapi" filter="s60" name="Key Management Daemon API">
+ <unit bldFile="vpnengine/kmdapi/group" filter="!oem_build"/>
+ </component>
+ <component id="kmdserver" filter="s60" name="Key Management Daemon Server">
+ <unit bldFile="vpnengine/kmdserver/group" filter="!oem_build"/>
+ </component>
+ <component id="ikeutils" filter="s60" name="Internet Key Exchange Utils">
+ <unit bldFile="vpnengine/ikeutils/group" filter="!oem_build"/>
+ </component>
+ <component id="ikev1lib" filter="s60" name="IKEv1 Library">
+ <unit bldFile="vpnengine/ikev1lib/group" filter="!oem_build"/>
+ </component>
+ <component id="ikev2lib" filter="s60" name="IKEv2 Library">
+ <unit bldFile="vpnengine/ikev2lib/group" filter="!oem_build"/>
+ </component>
+ <component id="vpnipsecpolparser" filter="s60" name="VPN IPsec Policy Parser">
+ <unit bldFile="vpnengine/vpnipsecpolparser/group" filter="!oem_build"/>
+ </component>
+ <component id="sit" filter="s60" name="Socket Interaction Thread">
+ <unit bldFile="vpnengine/sit/group" filter="!oem_build"/>
+ </component>
+
+ <component id="vpntcwrapper" filter="s60" name="VPN Terminal Control Wrapper">
+ <unit bldFile="vpnengine/vpntcwrapper/group" filter="!oem_build"/>
+ </component>
+ <component id="eventmediator" filter="s60" name="Event Mediator">
+ <unit bldFile="vpnengine/eventmediator/group" filter="!oem_build"/>
+ </component>
+ <component id="pkiservice" filter="s60" name="PKI Service">
+ <unit bldFile="vpnengine/pkiservice/group" filter="!oem_build"/>
+ </component>
+ <component id="vpnconnagt" filter="s60" name="VPN Connection Agent">
+ <unit bldFile="vpnengine/vpnconnagt/group" filter="!oem_build"/>
+ </component>
+ <component id="vpnmanager" filter="s60" name="VPN Manager">
+ <unit bldFile="vpnengine/vpnmanager/group" filter="!oem_build"/>
+ </component>
+ <component id="vpncleaner" filter="s60" name="VPN Cleaner">
+ <unit bldFile="vpnengine/vpncleaner/group" filter="!oem_build"/>
+ </component>
+
+ <component id="utlpkcs12" filter="s60" name="PKCS#12 Utilities">
+ <unit bldFile="vpnengine/utlpkcs12/group" filter="!oem_build"/>
+ </component>
+ <component id="dmadengine" filter="s60" name="DM Adapter Engine">
+ <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" filter="!oem_build"/>
+ </component>
+ <component id="dmadpki" filter="s60" name="PKI DM Adapter" class="plugin">
+ <unit bldFile="vpnengine/dmadpki/group" filter="!oem_build"/>
+ </component>
+ <component id="ikesocket" filter="s60" name="IKE Socket" introduced="^3">
+ <unit bldFile="vpnengine/ikesocketplugin/group" filter="!oem_build"/>
+ </component>
+ </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" filter="!oem_build"/>
+ </component>
+ <component id="vpndialogmanager" filter="s60" name="VPN Dialog Manager">
+ <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" filter="!oem_build"/>
+ </component>
+ <component id="vpnpolins" filter="s60" name="VPN Policy Installer">
+ <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" 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" filter="!oem_build"/>
+ </component>
+ <component id="vpnclient_build" filter="s60" name="VPN Client Build">
+ <!-- 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" filter="!oem_build"/>
+ </component>
+ </collection>
+ </package>
+</SystemDefinition>
--- a/symbian3/mw/web/package_definition.xml Fri Feb 12 16:37:22 2010 +0000
+++ b/symbian3/mw/web/package_definition.xml Mon Feb 15 18:25:55 2010 +0000
@@ -1,109 +1,248 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE SystemDefinition [
- <!ELEMENT SystemDefinition (systemModel?,SystemBuild?)>
- <!ATTLIST SystemDefinition
- name CDATA #REQUIRED
- schema CDATA #REQUIRED>
- <!ELEMENT systemModel (layer+)>
- <!ELEMENT layer (block*|collection*)*>
- <!ATTLIST layer
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED
- levels NMTOKENS #IMPLIED
- span CDATA #IMPLIED>
- <!ELEMENT block (subblock*|collection*)*>
- <!ATTLIST block
- levels NMTOKENS #IMPLIED
- span CDATA #IMPLIED
- level NMTOKEN #IMPLIED
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED>
- <!ELEMENT subblock (collection)*>
- <!ATTLIST subblock
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED>
- <!ELEMENT collection (component)*>
- <!ATTLIST collection
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED
- level NMTOKEN #IMPLIED>
- <!ELEMENT component (unit)*>
- <!ATTLIST component
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED
- deprecated CDATA #IMPLIED
- introduced CDATA #IMPLIED
- contract CDATA #IMPLIED
- plugin (Y|N) 'N'
- filter CDATA #IMPLIED
- class NMTOKENS #IMPLIED
- supports CDATA #IMPLIED
- purpose (optional|mandatory|development) 'optional'>
- <!ELEMENT unit EMPTY>
- <!ATTLIST unit
- mrp CDATA #IMPLIED
- filter CDATA #IMPLIED
- bldFile CDATA #IMPLIED
- root CDATA #IMPLIED
- version NMTOKEN #IMPLIED
- prebuilt NMTOKEN #IMPLIED
- late (Y|N) #IMPLIED
- priority CDATA #IMPLIED>
- <!ELEMENT SystemBuild (option*|target+|targetList+|list+|configuration+)*>
- <!ATTLIST SystemBuild schema CDATA #REQUIRED>
- <!ELEMENT list (ref+)>
- <!ATTLIST list
- name ID #REQUIRED
- description CDATA #REQUIRED>
- <!ELEMENT ref EMPTY>
- <!ATTLIST ref item CDATA #REQUIRED>
- <!ELEMENT targetList EMPTY>
- <!ATTLIST targetList
- name ID #REQUIRED
- description CDATA #REQUIRED
- target IDREFS #REQUIRED>
- <!ELEMENT target EMPTY>
- <!ATTLIST target
- name ID #REQUIRED
- abldTarget CDATA #REQUIRED
- description CDATA #REQUIRED>
- <!ELEMENT option EMPTY>
- <!ATTLIST option
- name ID #REQUIRED
- abldOption CDATA #REQUIRED
- description CDATA #REQUIRED
- enable (Y|N) #REQUIRED>
- <!ELEMENT configuration (listRef+|ref+|task+)*>
- <!ATTLIST configuration
- name ID #REQUIRED
- description CDATA #REQUIRED
- filter CDATA #REQUIRED>
- <!ELEMENT task (listRef*,(buildLayer|specialInstructions))>
- <!ELEMENT listRef EMPTY>
- <!ATTLIST listRef list CDATA #REQUIRED>
- <!ELEMENT buildLayer EMPTY>
- <!ATTLIST buildLayer
- command CDATA #REQUIRED
- targetList IDREFS #IMPLIED
- unitParallel (Y|N) #REQUIRED
- targetParallel (Y|N) 'N'>
- <!ELEMENT specialInstructions EMPTY>
- <!ATTLIST specialInstructions
- name CDATA #REQUIRED
- cwd CDATA #REQUIRED
- root CDATA #IMPLIED
- command CDATA #REQUIRED>
-]>
-<SystemDefinition schema="2.0.1" name="Symbian^3">
-<systemModel>
-<layer name="mw">
-<block name="web">
-<collection name="s60">
-<component name="web">
-<unit bldFile="/sf/mw/web/group" mrp=""/>
-</component>
-</collection>
-</block>
-</layer>
-</systemModel>
+<!DOCTYPE SystemDefinition [
+<!ELEMENT SystemDefinition ( systemModel )>
+<!ATTLIST SystemDefinition
+ name CDATA #REQUIRED
+ schema CDATA #REQUIRED
+>
+<!-- all paths are relative to the environment variable specified by the root attribute, or SOURCEROOT if not. -->
+
+<!-- System Model Section of DTD -->
+<!ELEMENT systemModel (layer+)>
+
+<!ELEMENT layer (block* | collection*)*>
+<!-- Kernel Services, Base Services, OS Services, Etc -->
+<!ATTLIST layer
+ name CDATA #REQUIRED
+ long-name CDATA #IMPLIED
+ levels NMTOKENS #IMPLIED
+ span CDATA #IMPLIED
+>
+
+<!ELEMENT block (subblock* | collection*)*>
+ <!-- Generic OS services, Comms Services, etc -->
+<!ATTLIST block
+ levels NMTOKENS #IMPLIED
+ span CDATA #IMPLIED
+ level NMTOKEN #IMPLIED
+ name CDATA #REQUIRED
+ long-name CDATA #IMPLIED
+>
+
+<!ELEMENT subblock (collection)*>
+<!-- Cellular Baseband Services, Networking Services, etc -->
+<!ATTLIST subblock
+ name CDATA #REQUIRED
+ long-name CDATA #IMPLIED
+>
+
+<!ELEMENT collection (component)*>
+<!-- Screen Driver, Content Handling, etc -->
+<!ATTLIST collection
+ name CDATA #REQUIRED
+ long-name CDATA #IMPLIED
+ level NMTOKEN #IMPLIED
+>
+
+<!ELEMENT component (unit)*>
+<!-- contains units or is a package or prebuilt -->
+<!ATTLIST component
+ name CDATA #REQUIRED
+ long-name CDATA #IMPLIED
+ deprecated CDATA #IMPLIED
+ introduced CDATA #IMPLIED
+ contract CDATA #IMPLIED
+ plugin (Y|N) "N"
+ filter CDATA #IMPLIED
+ class NMTOKENS #IMPLIED
+ supports CDATA #IMPLIED
+ purpose ( optional | mandatory | development ) "optional"
+>
+
+<!ELEMENT unit EMPTY >
+<!-- must be buildable (bld.inf) -->
+<!-- bldFile may someday be removed in favour of mrp -->
+<!ATTLIST unit
+ mrp CDATA #IMPLIED
+ filter CDATA #IMPLIED
+ bldFile CDATA #IMPLIED
+ root CDATA #IMPLIED
+ version NMTOKEN #IMPLIED
+ prebuilt NMTOKEN #IMPLIED
+ late (Y|N) #IMPLIED
+ priority CDATA #IMPLIED
+>
+]>
+<SystemDefinition name="Symbian^3" schema="2.0.1">
+ <systemModel>
+ <layer name="mw" long-name="Middleware" levels="generic specific">
+ <block name="web" level="specific" long-name="Web" levels="plugin utils server generic specific">
+ <collection name="web_info" long-name="Web Info" level="specific">
+ <component name="web_plat" filter="s60" long-name="Web Platform Interfaces" class="api">
+ <unit bldFile="/sf/mw/web/web_plat/group"/>
+ </component>
+ <component name="web_pub" filter="s60" long-name="Web Public Interfaces" class="api">
+ <unit bldFile="/sf/mw/web/web_pub/group"/>
+ </component>
+ <component name="web_build" filter="s60" long-name="Web Build">
+ <!-- when configuration is in place, the #ifdef is no longer needed and this component can be removed -->
+ <unit bldFile="/sf/mw/web/group"/>
+ </component>
+ </collection>
+ <collection name="browserutilities" long-name="Browser Utilities" level="utils">
+ <component name="browserdialogsprovider" filter="s60" long-name="Browser Dialogs Provider">
+ <unit bldFile="/sf/mw/web/browserutilities/browserdialogsprovider/group"/>
+ </component>
+ <component name="recenturlstore" filter="s60" long-name="Recent URL Store">
+ <unit bldFile="/sf/mw/web/browserutilities/recenturlstore/group"/>
+ </component>
+ <component name="xmlparser" filter="s60" long-name="XML Interface">
+ <unit bldFile="/sf/mw/web/browserutilities/xmlparser/group"/>
+ </component>
+ <component name="cxmllibrary" filter="s60" long-name="XML Parser Implementation">
+ <unit bldFile="/sf/mw/web/browserutilities/cxmllibrary/group"/>
+ </component>
+ <component name="downloadmgr" filter="s60" long-name="Download Manager">
+ <unit bldFile="/sf/mw/web/browserutilities/downloadmgr/group"/>
+ </component>
+ <component name="connectionmanager" filter="s60" long-name="Connection Manager">
+ <unit bldFile="/sf/mw/web/browserutilities/connectionmanager/group"/>
+ </component>
+ <component name="browsertelservice" filter="s60" long-name="Browser Telephony Service">
+ <unit bldFile="/sf/mw/web/browserutilities/browsertelservice/group"/>
+ </component>
+ <component name="favouritesengine" filter="s60" long-name="Favourites Engine">
+ <unit bldFile="/sf/mw/web/browserutilities/favouritesengine/group"/>
+ </component>
+ <component name="feedsengine" filter="s60" long-name="Feeds Engine">
+ <unit bldFile="/sf/mw/web/browserutilities/feedsengine/group"/>
+ </component>
+ <component name="multipartparser" filter="s60" long-name="Multipart Parser">
+ <!-- uncomment the unit when configuration is in place, it's currently #included from browserutilities_build -->
+ <!-- <unit bldFile="browserutilities/multipartparser/group"/> -->
+ </component>
+ <component name="schemehandler" filter="s60" long-name="Scheme Handler">
+ <unit bldFile="/sf/mw/web/browserutilities/schemehandler/group"/>
+ </component>
+ <component name="webutils" filter="s60" long-name="Web Utils">
+ <unit bldFile="/sf/mw/web/browserutilities/webutils/group"/>
+ </component>
+ <component name="aiwbrowserprovider" filter="s60" long-name="AIW Browser Provider" plugin="Y">
+ <unit bldFile="/sf/mw/web/browserutilities/aiwbrowserprovider/group"/>
+ </component>
+ <component name="browserutilities_build" filter="s60" long-name="Browser Utilities Build">
+ <!-- when configuration is in place, the #ifdef is no longer needed and this component can be removed -->
+ <unit bldFile="/sf/mw/web/browserutilities/group"/>
+ </component>
+ </collection>
+ <collection name="webengine" long-name="Web Engine" level="server">
+ <component name="osswebengine" filter="s60" long-name="OSS Web Engine">
+ <!-- can only have one unit. Either split into multiple components or #include from a single main bld.inf -->
+ <unit bldFile="/sf/mw/web/webengine/osswebengine/cache/group"/>
+ <unit bldFile="/sf/mw/web/webengine/osswebengine/memorymanager/group"/>
+ <unit bldFile="/sf/mw/web/webengine/osswebengine/npscript/group"/>
+ <unit bldFile="/sf/mw/web/webengine/osswebengine/webkit/s60/group"/>
+ <unit bldFile="/sf/mw/web/webengine/osswebengine/webkit/s60/group/javascriptcore"/>
+ </component>
+ <component name="webkitutils" filter="s60" long-name="WebKit Utils">
+ <unit bldFile="/sf/mw/web/webengine/webkitutils/group"/>
+ </component>
+ <component name="pagescaler" filter="s60" long-name="Page Scaler">
+ <unit bldFile="/sf/mw/web/webengine/pagescaler/group"/>
+ </component>
+ <component name="webwidgetinstaller" filter="s60" long-name="Widget Installer">
+ <unit bldFile="/sf/mw/web/webengine/widgetinstaller/group"/>
+ </component>
+ <component name="widgetregistry" filter="s60" long-name="Widget Registry">
+ <unit bldFile="/sf/mw/web/webengine/widgetregistry/group"/>
+ </component>
+ <component name="wmlengine" filter="s60" long-name="WML Engine">
+ <unit bldFile="/sf/mw/web/webengine/wmlengine/group"/>
+ </component>
+ <component name="device" filter="s60" long-name="Device">
+ <!-- this needs a more meaningful name -->
+ <unit bldFile="/sf/mw/web/webengine/device/group"/>
+ </component>
+ <component name="widgetengine" filter="s60" long-name="Widget Engine">
+ <unit bldFile="/sf/mw/web/webengine/widgetengine/group"/>
+ </component>
+ <component name="web_memoryplugin" long-name="Memory Plugin" filter="s60" plugin="Y">
+ <unit bldFile="/sf/mw/web/webengine/memoryplugin/group"/>
+ </component>
+ <component name="widgetmemoryplugin" filter="s60" long-name="Widget Memory Plugin" plugin="Y">
+ <unit bldFile="/sf/mw/web/webengine/widgetmemoryplugin/group"/>
+ </component>
+ <component name="widgetbackuprestore" filter="s60" long-name="Widget Backup and Restore">
+ <unit bldFile="/sf/mw/web/webengine/widgetbackuprestore/group"/>
+ </component>
+ <component name="browserrecognizers" filter="s60" long-name="Browser Recognizers" plugin="Y">
+ <unit bldFile="/sf/mw/web/webengine/browserrecognizers/group"/>
+ </component>
+ <component name="wrtharvester" filter="s60" long-name="Web Runtime Harvester" plugin="Y">
+ <unit bldFile="/sf/mw/web/webengine/wrtharvester/group"/>
+ </component>
+ </collection>
+ <collection name="codhandler" long-name="Content Object Descriptor Handler" level="specific">
+ <component name="codeng" filter="s60" long-name="COD Engine">
+ <unit bldFile="/sf/mw/web/codhandler/codeng/group"/>
+ </component>
+ <component name="codui" filter="s60" long-name="COD UI">
+ <unit bldFile="/sf/mw/web/codhandler/codui/group"/>
+ </component>
+ <component name="codrecog" filter="s60" long-name="COD Recogniser" plugin="Y">
+ <unit bldFile="/sf/mw/web/codhandler/codrecog/group"/>
+ </component>
+ <component name="codviewer" filter="s60" long-name="COD Viewer">
+ <unit bldFile="/sf/mw/web/codhandler/codviewer/group"/>
+ </component>
+ <component name="ddrecog" filter="s60" long-name="Download Descriptor Recogniser" plugin="Y">
+ <unit bldFile="/sf/mw/web/codhandler/ddrecog/group"/>
+ </component>
+ <component name="ddviewer" filter="s60" long-name="Download Descriptor Viewer">
+ <unit bldFile="/sf/mw/web/codhandler/ddviewer/group"/>
+ </component>
+ <component name="coddownload" filter="s60" long-name="COD Download">
+ <unit bldFile="/sf/mw/web/codhandler/coddownload/group"/>
+ </component>
+ <component name="roapapp" filter="s60" long-name="ROAP Application">
+ <unit bldFile="/sf/mw/web/codhandler/roapapp/group"/>
+ </component>
+ <component name="codhandler_build" filter="s60" long-name="COD Handler Build">
+ <!-- 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="/sf/mw/web/codhandler/group"/>
+ </component>
+ </collection>
+ <collection name="widgets" long-name="Web Widget Framework" level="generic">
+ <!-- the following units can be uncommented when configuration is put in place -->
+ <component name="widgetrecognizer" filter="s60" long-name="Widget Recognizer" plugin="Y">
+ <!--<unit bldFile="widgets/widgetrecognizer/group"/>-->
+ </component>
+ <component name="widgetinstaller" filter="s60" long-name="Widget Installer UI" plugin="Y">
+ <!--<unit bldFile="widgets/widgetinstaller/group"/>-->
+ </component>
+ <component name="widgetlauncher" filter="s60" long-name="Widget Launcher">
+ <unit bldFile="/sf/mw/web/widgets/widgetlauncher/group"/>
+ </component>
+ <component name="widgetapp" filter="s60" long-name="Widget UI">
+ <!--<unit bldFile="widgets/widgetapp/group"/>-->
+ </component>
+ <component name="widgetsidchecker" filter="s60" long-name="Widget SID Checker" introduced="^3">
+ <!--<unit bldFile="widgets/widgetsidchecker/group"/>-->
+ </component>
+ <component name="widgetpreinstaller" filter="s60" long-name="Widget Pre-Installer">
+ <!--<unit bldFile="widgets/widgetpreinstaller/group"/>-->
+ </component>
+ <component name="widgetstartup" filter="s60" long-name="Widget Startup">
+ <!--<unit bldFile="widgets/widgetstartup/group"/>-->
+ </component>
+ <component name="widgets_build" filter="s60" long-name="Widgets Build">
+ <!-- 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="/sf/mw/web/widgets/group"/>
+ </component>
+ </collection>
+ </block>
+ </layer>
+ </systemModel>
</SystemDefinition>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/symbian3/mw/web/package_definition_3.0.xml Mon Feb 15 18:25:55 2010 +0000
@@ -0,0 +1,197 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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"/>
+ </component>
+ <component id="web_build" filter="s60" name="Web Build">
+ <!-- when configuration is in place, the #ifdef is no longer needed and this component can be removed -->
+ <unit bldFile="group"/>
+ </component>
+ </collection>
+ <collection id="browserutilities" name="Browser Utilities" level="utils">
+ <component id="browserdialogsprovider" filter="s60" name="Browser Dialogs Provider">
+ <unit bldFile="browserutilities/browserdialogsprovider/group"/>
+ </component>
+ <component id="recenturlstore" filter="s60" name="Recent URL Store">
+ <unit bldFile="browserutilities/recenturlstore/group"/>
+ </component>
+ <component id="xmlparser" filter="s60" name="XML Interface">
+ <unit bldFile="browserutilities/xmlparser/group"/>
+ </component>
+ <component id="cxmllibrary" filter="s60" name="XML Parser Implementation">
+ <unit bldFile="browserutilities/cxmllibrary/group"/>
+ </component>
+ <component id="downloadmgr" filter="s60" name="Download Manager">
+ <unit bldFile="browserutilities/downloadmgr/group"/>
+ </component>
+ <component id="connectionmanager" filter="s60" name="Connection Manager">
+ <unit bldFile="browserutilities/connectionmanager/group"/>
+ </component>
+ <component id="browsertelservice" filter="s60" name="Browser Telephony Service">
+ <unit bldFile="browserutilities/browsertelservice/group"/>
+ </component>
+ <component id="favouritesengine" filter="s60" name="Favourites Engine">
+ <unit bldFile="browserutilities/favouritesengine/group"/>
+ </component>
+ <component id="feedsengine" filter="s60" name="Feeds Engine">
+ <unit bldFile="browserutilities/feedsengine/group"/>
+ </component>
+ <component id="multipartparser" filter="s60" name="Multipart Parser">
+ <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"/>
+ </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">
+ <!-- when configuration is in place, the #ifdef is no longer needed and this component can be removed -->
+ <unit bldFile="browserutilities/group"/>
+ </component>
+ </collection>
+ <collection id="webengine" name="Web Engine" level="server">
+ <component id="osswebengine" filter="s60" name="OSS Web Engine">
+ <!-- can only have one unit. Either split into multiple components or #include from a single main bld.inf -->
+ <unit bldFile="webengine/osswebengine/cache/group"/>
+ <unit bldFile="webengine/osswebengine/memorymanager/group"/>
+ <unit bldFile="webengine/osswebengine/npscript/group"/>
+ <unit bldFile="webengine/osswebengine/webkit/s60/group"/>
+ <unit bldFile="webengine/osswebengine/webkit/s60/group/javascriptcore"/>
+ </component>
+ <component id="webkitutils" filter="s60" name="WebKit Utils">
+ <unit bldFile="webengine/webkitutils/group"/>
+ </component>
+ <component id="pagescaler" filter="s60" name="Page Scaler">
+ <unit bldFile="webengine/pagescaler/group"/>
+ </component>
+ <component id="webwidgetinstaller" filter="s60" name="Widget Installer">
+ <unit bldFile="webengine/widgetinstaller/group"/>
+ </component>
+ <component id="widgetregistry" filter="s60" name="Widget Registry">
+ <unit bldFile="webengine/widgetregistry/group"/>
+ </component>
+ <component id="wmlengine" filter="s60" name="WML Engine">
+ <unit bldFile="webengine/wmlengine/group"/>
+ </component>
+ <component id="device" filter="s60" name="Device">
+ <!-- this needs a more meaningful name -->
+ <unit bldFile="webengine/device/group"/>
+ </component>
+ <component id="widgetengine" filter="s60" name="Widget Engine">
+ <unit bldFile="webengine/widgetengine/group"/>
+ </component>
+ <component id="web_memoryplugin" name="Memory Plugin" filter="s60" class="plugin">
+ <unit bldFile="webengine/memoryplugin/group"/>
+ </component>
+ <component id="widgetmemoryplugin" filter="s60" name="Widget Memory Plugin" class="plugin">
+ <unit bldFile="webengine/widgetmemoryplugin/group"/>
+ </component>
+ <component id="widgetbackuprestore" filter="s60" name="Widget Backup and Restore">
+ <unit bldFile="webengine/widgetbackuprestore/group"/>
+ </component>
+ <component id="browserrecognizers" filter="s60" name="Browser Recognizers" class="plugin">
+ <unit bldFile="webengine/browserrecognizers/group"/>
+ </component>
+ <component id="wrtharvester" filter="s60" name="Web Runtime Harvester" class="plugin">
+ <unit bldFile="webengine/wrtharvester/group"/>
+ </component>
+ </collection>
+ <collection id="codhandler" name="Content Object Descriptor Handler" level="specific">
+ <component id="codeng" filter="s60" name="COD Engine">
+ <unit bldFile="codhandler/codeng/group"/>
+ </component>
+ <component id="codui" filter="s60" name="COD UI">
+ <unit bldFile="codhandler/codui/group"/>
+ </component>
+ <component id="codrecog" filter="s60" name="COD Recogniser" class="plugin">
+ <unit bldFile="codhandler/codrecog/group"/>
+ </component>
+ <component id="codviewer" filter="s60" name="COD Viewer">
+ <unit bldFile="codhandler/codviewer/group"/>
+ </component>
+ <component id="ddrecog" filter="s60" name="Download Descriptor Recogniser" class="plugin">
+ <unit bldFile="codhandler/ddrecog/group"/>
+ </component>
+ <component id="ddviewer" filter="s60" name="Download Descriptor Viewer">
+ <unit bldFile="codhandler/ddviewer/group"/>
+ </component>
+ <component id="coddownload" filter="s60" name="COD Download">
+ <unit bldFile="codhandler/coddownload/group"/>
+ </component>
+ <component id="roapapp" filter="s60" name="ROAP Application">
+ <unit bldFile="codhandler/roapapp/group"/>
+ </component>
+ <component id="codhandler_build" filter="s60" name="COD Handler Build">
+ <!-- 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">
+ <meta rel="config">
+ <defined condition="__WEB_WIDGETS"/>
+ </meta>
+ <!--<unit bldFile="widgets/widgetrecognizer/group"/>-->
+ </component>
+ <component id="widgetinstaller" filter="s60" name="Widget Installer UI" class="plugin">
+ <meta rel="config">
+ <defined condition="__WEB_WIDGETS"/>
+ </meta>
+ <!--<unit bldFile="widgets/widgetinstaller/group"/>-->
+ </component>
+ <component id="widgetlauncher" filter="s60" name="Widget Launcher">
+ <meta rel="config">
+ <!-- <defined condition="__WEB_WIDGETS"/>-->
+ </meta>
+ <unit bldFile="widgets/widgetlauncher/group"/>
+ </component>
+ <component id="widgetapp" filter="s60" name="Widget UI">
+ <meta rel="config">
+ <defined condition="__WEB_WIDGETS"/>
+ </meta>
+ <!--<unit bldFile="widgets/widgetapp/group"/>-->
+ </component>
+ <component id="widgetsidchecker" filter="s60" name="Widget SID Checker" introduced="^3">
+ <meta rel="config">
+ <defined condition="APP_SID_CHECK_SUPPORT_FF"/>
+ </meta>
+ <!--<unit bldFile="widgets/widgetsidchecker/group"/>-->
+ </component>
+ <component id="widgetpreinstaller" filter="s60" name="Widget Pre-Installer">
+ <meta rel="config">
+ <defined condition="RD_WIDGET_PREINSTALLER"/>
+ </meta>
+ <!--<unit bldFile="widgets/widgetpreinstaller/group"/>-->
+ </component>
+ <component id="widgetstartup" filter="s60" name="Widget Startup">
+ <meta rel="config">
+ <defined condition="RD_WIDGET_PREINSTALLER"/>
+ </meta>
+ <!--<unit bldFile="widgets/widgetstartup/group"/>-->
+ </component>
+ <component id="widgets_build" filter="s60" name="Widgets Build">
+ <!-- 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>
+ </package>
+</SystemDefinition>
--- a/symbian3/mw/websrv/package_definition.xml Fri Feb 12 16:37:22 2010 +0000
+++ b/symbian3/mw/websrv/package_definition.xml Mon Feb 15 18:25:55 2010 +0000
@@ -1,109 +1,183 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE SystemDefinition [
- <!ELEMENT SystemDefinition (systemModel?,SystemBuild?)>
- <!ATTLIST SystemDefinition
- name CDATA #REQUIRED
- schema CDATA #REQUIRED>
- <!ELEMENT systemModel (layer+)>
- <!ELEMENT layer (block*|collection*)*>
- <!ATTLIST layer
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED
- levels NMTOKENS #IMPLIED
- span CDATA #IMPLIED>
- <!ELEMENT block (subblock*|collection*)*>
- <!ATTLIST block
- levels NMTOKENS #IMPLIED
- span CDATA #IMPLIED
- level NMTOKEN #IMPLIED
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED>
- <!ELEMENT subblock (collection)*>
- <!ATTLIST subblock
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED>
- <!ELEMENT collection (component)*>
- <!ATTLIST collection
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED
- level NMTOKEN #IMPLIED>
- <!ELEMENT component (unit)*>
- <!ATTLIST component
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED
- deprecated CDATA #IMPLIED
- introduced CDATA #IMPLIED
- contract CDATA #IMPLIED
- plugin (Y|N) 'N'
- filter CDATA #IMPLIED
- class NMTOKENS #IMPLIED
- supports CDATA #IMPLIED
- purpose (optional|mandatory|development) 'optional'>
- <!ELEMENT unit EMPTY>
- <!ATTLIST unit
- mrp CDATA #IMPLIED
- filter CDATA #IMPLIED
- bldFile CDATA #IMPLIED
- root CDATA #IMPLIED
- version NMTOKEN #IMPLIED
- prebuilt NMTOKEN #IMPLIED
- late (Y|N) #IMPLIED
- priority CDATA #IMPLIED>
- <!ELEMENT SystemBuild (option*|target+|targetList+|list+|configuration+)*>
- <!ATTLIST SystemBuild schema CDATA #REQUIRED>
- <!ELEMENT list (ref+)>
- <!ATTLIST list
- name ID #REQUIRED
- description CDATA #REQUIRED>
- <!ELEMENT ref EMPTY>
- <!ATTLIST ref item CDATA #REQUIRED>
- <!ELEMENT targetList EMPTY>
- <!ATTLIST targetList
- name ID #REQUIRED
- description CDATA #REQUIRED
- target IDREFS #REQUIRED>
- <!ELEMENT target EMPTY>
- <!ATTLIST target
- name ID #REQUIRED
- abldTarget CDATA #REQUIRED
- description CDATA #REQUIRED>
- <!ELEMENT option EMPTY>
- <!ATTLIST option
- name ID #REQUIRED
- abldOption CDATA #REQUIRED
- description CDATA #REQUIRED
- enable (Y|N) #REQUIRED>
- <!ELEMENT configuration (listRef+|ref+|task+)*>
- <!ATTLIST configuration
- name ID #REQUIRED
- description CDATA #REQUIRED
- filter CDATA #REQUIRED>
- <!ELEMENT task (listRef*,(buildLayer|specialInstructions))>
- <!ELEMENT listRef EMPTY>
- <!ATTLIST listRef list CDATA #REQUIRED>
- <!ELEMENT buildLayer EMPTY>
- <!ATTLIST buildLayer
- command CDATA #REQUIRED
- targetList IDREFS #IMPLIED
- unitParallel (Y|N) #REQUIRED
- targetParallel (Y|N) 'N'>
- <!ELEMENT specialInstructions EMPTY>
- <!ATTLIST specialInstructions
- name CDATA #REQUIRED
- cwd CDATA #REQUIRED
- root CDATA #IMPLIED
- command CDATA #REQUIRED>
-]>
-<SystemDefinition schema="2.0.1" name="Symbian^3">
-<systemModel>
-<layer name="mw">
-<block name="websrv">
-<collection name="s60">
-<component name="websrv">
-<unit bldFile="/sf/mw/websrv/group" mrp=""/>
-</component>
-</collection>
-</block>
-</layer>
-</systemModel>
+<!DOCTYPE SystemDefinition [
+<!ELEMENT SystemDefinition ( systemModel )>
+<!ATTLIST SystemDefinition
+ name CDATA #REQUIRED
+ schema CDATA #REQUIRED
+>
+<!-- all paths are relative to the environment variable specified by the root attribute, or SOURCEROOT if not. -->
+
+<!-- System Model Section of DTD -->
+<!ELEMENT systemModel (layer+)>
+
+<!ELEMENT layer (block* | collection*)*>
+<!-- Kernel Services, Base Services, OS Services, Etc -->
+<!ATTLIST layer
+ name CDATA #REQUIRED
+ long-name CDATA #IMPLIED
+ levels NMTOKENS #IMPLIED
+ span CDATA #IMPLIED
+>
+
+<!ELEMENT block (subblock* | collection*)*>
+ <!-- Generic OS services, Comms Services, etc -->
+<!ATTLIST block
+ levels NMTOKENS #IMPLIED
+ span CDATA #IMPLIED
+ level NMTOKEN #IMPLIED
+ name CDATA #REQUIRED
+ long-name CDATA #IMPLIED
+>
+
+<!ELEMENT subblock (collection)*>
+<!-- Cellular Baseband Services, Networking Services, etc -->
+<!ATTLIST subblock
+ name CDATA #REQUIRED
+ long-name CDATA #IMPLIED
+>
+
+<!ELEMENT collection (component)*>
+<!-- Screen Driver, Content Handling, etc -->
+<!ATTLIST collection
+ name CDATA #REQUIRED
+ long-name CDATA #IMPLIED
+ level NMTOKEN #IMPLIED
+>
+
+<!ELEMENT component (unit)*>
+<!-- contains units or is a package or prebuilt -->
+<!ATTLIST component
+ name CDATA #REQUIRED
+ long-name CDATA #IMPLIED
+ deprecated CDATA #IMPLIED
+ introduced CDATA #IMPLIED
+ contract CDATA #IMPLIED
+ plugin (Y|N) "N"
+ filter CDATA #IMPLIED
+ class NMTOKENS #IMPLIED
+ supports CDATA #IMPLIED
+ purpose ( optional | mandatory | development ) "optional"
+>
+
+<!ELEMENT unit EMPTY >
+<!-- must be buildable (bld.inf) -->
+<!-- bldFile may someday be removed in favour of mrp -->
+<!ATTLIST unit
+ mrp CDATA #IMPLIED
+ filter CDATA #IMPLIED
+ bldFile CDATA #IMPLIED
+ root CDATA #IMPLIED
+ version NMTOKEN #IMPLIED
+ prebuilt NMTOKEN #IMPLIED
+ late (Y|N) #IMPLIED
+ priority CDATA #IMPLIED
+>
+]>
+<SystemDefinition name="Symbian^3" schema="2.0.1">
+ <systemModel>
+ <layer name="mw" long-name="Middleware" levels="generic specific">
+ <block name="websrv" level="generic" long-name="Web Services" levels="plugin framework server generic specific">
+ <collection name="webservices" long-name="Web Services Framework" level="generic">
+ <!-- consider breaking this collection into more meaningful subsets -->
+ <component name="wsnotifierplugins" filter="s60" long-name="WS Notifier Plugins" plugin="Y">
+ <unit bldFile="/sf/mw/websrv/webservices/wsnotifierplugins/group"/>
+ </component>
+ <component name="wslogger" filter="s60" long-name="WS Logger">
+ <unit bldFile="/sf/mw/websrv/webservices/wslogger/group"/>
+ </component>
+ <component name="wsxml" filter="s60" long-name="WS XML Extensions">
+ <unit bldFile="/sf/mw/websrv/webservices/wsxml/group"/>
+ </component>
+ <component name="wsutils" filter="s60" long-name="WS Utils">
+ <unit bldFile="/sf/mw/websrv/webservices/wsutils/group"/>
+ </component>
+ <component name="wsfragment" filter="s60" long-name="WS Fragment">
+ <unit bldFile="/sf/mw/websrv/webservices/wsfragment/group"/>
+ </component>
+ <component name="wsdescription" filter="s60" long-name="WS Service Description">
+ <unit bldFile="/sf/mw/websrv/webservices/wsdescription/group"/>
+ </component>
+ <component name="wsconnection" filter="s60" long-name="WS Service Connection">
+ <unit bldFile="/sf/mw/websrv/webservices/wsconnection/group"/>
+ </component>
+ <component name="wsmessages" filter="s60" long-name="WS Messages">
+ <unit bldFile="/sf/mw/websrv/webservices/wsmessages/group"/>
+ </component>
+ <component name="wscredentialmanager" filter="s60" long-name="WS Credential Manager">
+ <unit bldFile="/sf/mw/websrv/webservices/wscredentialmanager/group"/>
+ </component>
+ <component name="wsframework" filter="s60" long-name="WS Framework">
+ <unit bldFile="/sf/mw/websrv/webservices/wsframework/group"/>
+ </component>
+ <component name="wshttpchanneltransportplugin" filter="s60" long-name="WS HTTP Channel Transport Plugin" plugin="Y">
+ <unit bldFile="/sf/mw/websrv/webservices/wshttpchanneltransportplugin/group"/>
+ </component>
+ <component name="wsconnectionagent" filter="s60" long-name="WS Connection Agent">
+ <unit bldFile="/sf/mw/websrv/webservices/wsconnectionagent/group"/>
+ </component>
+ <component name="wsprovider" filter="s60" long-name="WS Provider">
+ <unit bldFile="/sf/mw/websrv/webservices/wsprovider/group"/>
+ </component>
+ <component name="wshostletconnection" filter="s60" long-name="WS Hostlet Connection">
+ <unit bldFile="/sf/mw/websrv/webservices/wshostletconnection/group"/>
+ </component>
+ <component name="wsmanager" filter="s60" long-name="WS Service Manager">
+ <unit bldFile="/sf/mw/websrv/webservices/wsmanager/group"/>
+ </component>
+ <component name="wsidentitymanager" filter="s60" long-name="WS Identity Manager">
+ <unit bldFile="/sf/mw/websrv/webservices/wsidentitymanager/group"/>
+ </component>
+ <component name="idwsfplugin" filter="s60" long-name="ID-WSF Plugin" plugin="Y">
+ <unit bldFile="/sf/mw/websrv/webservices/idwsfplugin/group"/>
+ </component>
+ <component name="wsibasicplugin" filter="s60" long-name="WS-I Basic Plugin" plugin="Y">
+ <unit bldFile="/sf/mw/websrv/webservices/wsibasicplugin/group"/>
+ </component>
+ <component name="wsrestplugin" filter="s60" long-name="WS REST Plugin" plugin="Y">
+ <unit bldFile="/sf/mw/websrv/webservices/wsrestplugin/group"/>
+ </component>
+ <component name="idwsfsecuritymechanism" filter="s60" long-name="ID-WSF Security Mechanism">
+ <unit bldFile="/sf/mw/websrv/webservices/idwsfsecuritymechanism/group"/>
+ </component>
+ <component name="wspasswordtransforms" filter="s60" long-name="WS Password Transforms">
+ <unit bldFile="/sf/mw/websrv/webservices/wspasswordtransforms/group"/>
+ </component>
+ <component name="wscore" filter="s60" long-name="WS Core Service Manager">
+ <unit bldFile="/sf/mw/websrv/webservices/wscore/group"/>
+ </component>
+ <component name="wslocaltransportplugin" filter="s60" long-name="WS Local Transport Plugin" plugin="Y">
+ <unit bldFile="/sf/mw/websrv/webservices/wslocaltransportplugin/group"/>
+ </component>
+ <component name="wshostlettransportplugin" filter="s60" long-name="WS Hostlet Transport Plugin" plugin="Y">
+ <unit bldFile="/sf/mw/websrv/webservices/wshostlettransportplugin/group"/>
+ </component>
+ <component name="wsstar" filter="s60" long-name="WS Star">
+ <!-- can only have one unit. Need to split into separate components or #include from a single bld.inf -->
+ <unit bldFile="/sf/mw/websrv/webservices/wsstar/wsstarpolicy/group"/>
+ <unit bldFile="/sf/mw/websrv/webservices/wsstar/wsstarplugin/group"/>
+ <unit bldFile="/sf/mw/websrv/webservices/wsstar/wsstarmessagehandlers/group"/>
+ </component>
+ <component name="wsoviplugin" filter="s60" long-name="WS Ovi Plugin">
+ <unit bldFile="/sf/mw/websrv/webservices/wsoviplugin/group"/>
+ </component>
+ <component name="wsoviplugin" filter="s60" long-name="WS Ovi Plugin">
+ <unit bldFile="/sf/mw/websrv/webservices/wsoviplugin/group"/>
+ </component>
+ <component name="webservices_build" filter="s60" long-name="Web Services Build">
+ <!-- need to split into self-contained components -->
+ <unit bldFile="/sf/mw/websrv/webservices/group"/>
+ </component>
+ </collection>
+ <collection name="websrv_info" long-name="Web Services Info" level="specific">
+ <component name="websrv_bld" filter="s60" long-name="Web Services Build">
+ <!-- need to include common .hrh in each unit -->
+ <unit bldFile="/sf/mw/websrv/group"/>
+ </component>
+ <component name="websrv_pub" filter="s60" long-name="Web Services Public Interfaces" class="api">
+ <unit bldFile="/sf/mw/websrv/websrv_pub/group"/>
+ </component>
+ </collection>
+ </block>
+ </layer>
+ </systemModel>
</SystemDefinition>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/symbian3/mw/websrv/package_definition_3.0.xml Mon Feb 15 18:25:55 2010 +0000
@@ -0,0 +1,105 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<SystemDefinition schema="3.0.0">
+ <package id="websrv" name="Web Services" levels="plugin framework server generic specific">
+ <collection id="webservices" name="Web Services Framework" level="generic">
+ <!-- consider breaking this collection into more meaningful subsets -->
+ <component id="wsnotifierplugins" filter="s60" name="WS Notifier Plugins" class="plugin">
+ <unit bldFile="webservices/wsnotifierplugins/group"/>
+ </component>
+ <component id="wslogger" filter="s60" name="WS Logger">
+ <unit bldFile="webservices/wslogger/group"/>
+ </component>
+ <component id="wsxml" filter="s60" name="WS XML Extensions">
+ <unit bldFile="webservices/wsxml/group"/>
+ </component>
+ <component id="wsutils" filter="s60" name="WS Utils">
+ <unit bldFile="webservices/wsutils/group"/>
+ </component>
+ <component id="wsfragment" filter="s60" name="WS Fragment">
+ <unit bldFile="webservices/wsfragment/group"/>
+ </component>
+ <component id="wsdescription" filter="s60" name="WS Service Description">
+ <unit bldFile="webservices/wsdescription/group"/>
+ </component>
+ <component id="wsconnection" filter="s60" name="WS Service Connection">
+ <unit bldFile="webservices/wsconnection/group"/>
+ </component>
+ <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="idwsfplugin" filter="s60" name="ID-WSF Plugin" class="plugin">
+ <unit bldFile="webservices/idwsfplugin/group"/>
+ </component>
+ <component id="wsibasicplugin" filter="s60" name="WS-I Basic Plugin" class="plugin">
+ <unit bldFile="webservices/wsibasicplugin/group"/>
+ </component>
+ <component id="wsrestplugin" filter="s60" name="WS REST Plugin" class="plugin">
+ <unit bldFile="webservices/wsrestplugin/group"/>
+ </component>
+ <component id="idwsfsecuritymechanism" filter="s60" name="ID-WSF Security Mechanism">
+ <unit bldFile="webservices/idwsfsecuritymechanism/group"/>
+ </component>
+ <component id="wspasswordtransforms" filter="s60" name="WS Password Transforms">
+ <unit bldFile="webservices/wspasswordtransforms/group"/>
+ </component>
+ <component id="wscore" filter="s60" name="WS Core Service Manager">
+ <unit bldFile="webservices/wscore/group"/>
+ </component>
+ <component id="wslocaltransportplugin" filter="s60" name="WS Local Transport Plugin" class="plugin">
+ <unit bldFile="webservices/wslocaltransportplugin/group"/>
+ </component>
+ <component id="wshostlettransportplugin" filter="s60" name="WS Hostlet Transport Plugin" class="plugin">
+ <unit bldFile="webservices/wshostlettransportplugin/group"/>
+ </component>
+ <component id="wsstar" filter="s60" name="WS Star">
+ <!-- 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"/>
+ </component>
+ </collection>
+ </package>
+</SystemDefinition>
--- a/symbian3/mw/wirelessacc/package_definition.xml Fri Feb 12 16:37:22 2010 +0000
+++ b/symbian3/mw/wirelessacc/package_definition.xml Mon Feb 15 18:25:55 2010 +0000
@@ -1,109 +1,130 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE SystemDefinition [
- <!ELEMENT SystemDefinition (systemModel?,SystemBuild?)>
- <!ATTLIST SystemDefinition
- name CDATA #REQUIRED
- schema CDATA #REQUIRED>
- <!ELEMENT systemModel (layer+)>
- <!ELEMENT layer (block*|collection*)*>
- <!ATTLIST layer
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED
- levels NMTOKENS #IMPLIED
- span CDATA #IMPLIED>
- <!ELEMENT block (subblock*|collection*)*>
- <!ATTLIST block
- levels NMTOKENS #IMPLIED
- span CDATA #IMPLIED
- level NMTOKEN #IMPLIED
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED>
- <!ELEMENT subblock (collection)*>
- <!ATTLIST subblock
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED>
- <!ELEMENT collection (component)*>
- <!ATTLIST collection
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED
- level NMTOKEN #IMPLIED>
- <!ELEMENT component (unit)*>
- <!ATTLIST component
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED
- deprecated CDATA #IMPLIED
- introduced CDATA #IMPLIED
- contract CDATA #IMPLIED
- plugin (Y|N) 'N'
- filter CDATA #IMPLIED
- class NMTOKENS #IMPLIED
- supports CDATA #IMPLIED
- purpose (optional|mandatory|development) 'optional'>
- <!ELEMENT unit EMPTY>
- <!ATTLIST unit
- mrp CDATA #IMPLIED
- filter CDATA #IMPLIED
- bldFile CDATA #IMPLIED
- root CDATA #IMPLIED
- version NMTOKEN #IMPLIED
- prebuilt NMTOKEN #IMPLIED
- late (Y|N) #IMPLIED
- priority CDATA #IMPLIED>
- <!ELEMENT SystemBuild (option*|target+|targetList+|list+|configuration+)*>
- <!ATTLIST SystemBuild schema CDATA #REQUIRED>
- <!ELEMENT list (ref+)>
- <!ATTLIST list
- name ID #REQUIRED
- description CDATA #REQUIRED>
- <!ELEMENT ref EMPTY>
- <!ATTLIST ref item CDATA #REQUIRED>
- <!ELEMENT targetList EMPTY>
- <!ATTLIST targetList
- name ID #REQUIRED
- description CDATA #REQUIRED
- target IDREFS #REQUIRED>
- <!ELEMENT target EMPTY>
- <!ATTLIST target
- name ID #REQUIRED
- abldTarget CDATA #REQUIRED
- description CDATA #REQUIRED>
- <!ELEMENT option EMPTY>
- <!ATTLIST option
- name ID #REQUIRED
- abldOption CDATA #REQUIRED
- description CDATA #REQUIRED
- enable (Y|N) #REQUIRED>
- <!ELEMENT configuration (listRef+|ref+|task+)*>
- <!ATTLIST configuration
- name ID #REQUIRED
- description CDATA #REQUIRED
- filter CDATA #REQUIRED>
- <!ELEMENT task (listRef*,(buildLayer|specialInstructions))>
- <!ELEMENT listRef EMPTY>
- <!ATTLIST listRef list CDATA #REQUIRED>
- <!ELEMENT buildLayer EMPTY>
- <!ATTLIST buildLayer
- command CDATA #REQUIRED
- targetList IDREFS #IMPLIED
- unitParallel (Y|N) #REQUIRED
- targetParallel (Y|N) 'N'>
- <!ELEMENT specialInstructions EMPTY>
- <!ATTLIST specialInstructions
- name CDATA #REQUIRED
- cwd CDATA #REQUIRED
- root CDATA #IMPLIED
- command CDATA #REQUIRED>
-]>
-<SystemDefinition schema="2.0.1" name="Symbian^3">
-<systemModel>
-<layer name="mw">
-<block name="wirelessacc">
-<collection name="s60">
-<component name="wirelessacc">
-<unit bldFile="/sf/mw/wirelessacc/group" mrp=""/>
-</component>
-</collection>
-</block>
-</layer>
-</systemModel>
+<!DOCTYPE SystemDefinition [
+<!ELEMENT SystemDefinition ( systemModel )>
+<!ATTLIST SystemDefinition
+ name CDATA #REQUIRED
+ schema CDATA #REQUIRED
+>
+<!-- all paths are relative to the environment variable specified by the root attribute, or SOURCEROOT if not. -->
+
+<!-- System Model Section of DTD -->
+<!ELEMENT systemModel (layer+)>
+
+<!ELEMENT layer (block* | collection*)*>
+<!-- Kernel Services, Base Services, OS Services, Etc -->
+<!ATTLIST layer
+ name CDATA #REQUIRED
+ long-name CDATA #IMPLIED
+ levels NMTOKENS #IMPLIED
+ span CDATA #IMPLIED
+>
+
+<!ELEMENT block (subblock* | collection*)*>
+ <!-- Generic OS services, Comms Services, etc -->
+<!ATTLIST block
+ levels NMTOKENS #IMPLIED
+ span CDATA #IMPLIED
+ level NMTOKEN #IMPLIED
+ name CDATA #REQUIRED
+ long-name CDATA #IMPLIED
+>
+
+<!ELEMENT subblock (collection)*>
+<!-- Cellular Baseband Services, Networking Services, etc -->
+<!ATTLIST subblock
+ name CDATA #REQUIRED
+ long-name CDATA #IMPLIED
+>
+
+<!ELEMENT collection (component)*>
+<!-- Screen Driver, Content Handling, etc -->
+<!ATTLIST collection
+ name CDATA #REQUIRED
+ long-name CDATA #IMPLIED
+ level NMTOKEN #IMPLIED
+>
+
+<!ELEMENT component (unit)*>
+<!-- contains units or is a package or prebuilt -->
+<!ATTLIST component
+ name CDATA #REQUIRED
+ long-name CDATA #IMPLIED
+ deprecated CDATA #IMPLIED
+ introduced CDATA #IMPLIED
+ contract CDATA #IMPLIED
+ plugin (Y|N) "N"
+ filter CDATA #IMPLIED
+ class NMTOKENS #IMPLIED
+ supports CDATA #IMPLIED
+ purpose ( optional | mandatory | development ) "optional"
+>
+
+<!ELEMENT unit EMPTY >
+<!-- must be buildable (bld.inf) -->
+<!-- bldFile may someday be removed in favour of mrp -->
+<!ATTLIST unit
+ mrp CDATA #IMPLIED
+ filter CDATA #IMPLIED
+ bldFile CDATA #IMPLIED
+ root CDATA #IMPLIED
+ version NMTOKEN #IMPLIED
+ prebuilt NMTOKEN #IMPLIED
+ late (Y|N) #IMPLIED
+ priority CDATA #IMPLIED
+>
+]>
+<SystemDefinition name="Symbian^3" schema="2.0.1">
+ <systemModel>
+ <layer name="mw" long-name="Middleware" levels="generic specific">
+ <block name="wirelessacc" level="specific" long-name="Wireless Access" levels="framework generic ui">
+ <collection name="hotspotfw" long-name="HotSpot Framework" level="framework">
+ <component name="hsserver" filter="s60" long-name="HotSpot Server" class="placeholder">
+ <!-- needs bld.inf extracted from the hotspotfw/group one, or this component should be removed-->
+ </component>
+ <component name="hsclient" filter="s60" long-name="HotSpot Client" class="placeholder">
+ <!-- needs bld.inf extracted from the hotspotfw/group one, or this component should be removed-->
+ </component>
+ <component name="internetconnectivitytestservice" filter="s60" long-name="Internet Connectivity Test Service" class="placeholder">
+ <!-- needs bld.inf un-#included from hotspotfw/group/bld.inf, or this component should be removed-->
+ <!-- <unit bldFile="hotspotfw/internetconnectivitytestservice/group"/> -->
+ </component>
+ <component name="ictsdialogs" filter="s60" long-name="Internet Connectivity Test Service Dialogs" deprecated="^3" class="placeholder">
+ <!-- needs bld.inf un-#included from hotspotfw/group/bld.inf, or this component should be removed-->
+ <!-- <unit bldFile="hotspotfw/ictsdialogs/group"/> -->
+ </component>
+ <component name="hspluginforagent" filter="s60" long-name="HotSpot Plugin for Agent" plugin="Y" class="placeholder">
+ <!-- needs bld.inf un-#included from hotspotfw/group/bld.inf, or this component should be removed-->
+ <!-- <unit bldFile="hotspotfw/hspluginforagent/group"/> -->
+ </component>
+ <component name="hsbrowser" filter="s60" long-name="HotSpot Browser" class="placeholder">
+ <!-- needs bld.inf un-#included from hotspotfw/group/bld.inf, or this component should be removed-->
+ <!-- <unit bldFile="hotspotfw/hsbrowser/group"/> -->
+ </component>
+ <component name="hotspotfw_build" filter="s60" long-name="Hotspot Framework Build">
+ <!-- should break up this bld.inf into the above components, or collapse them all into a single component -->
+ <unit bldFile="/sf/mw/wirelessacc/hotspotfw/group"/>
+ </component>
+ </collection>
+ <collection name="wlanutilities" long-name="WLAN Utilities" level="generic">
+ <component name="wlanplugin" filter="s60" long-name="WLAN Plugin" plugin="Y">
+ <unit bldFile="/sf/mw/wirelessacc/wlanutilities/wlanplugin/group"/>
+ </component>
+ <component name="wlansettingsui" filter="s60" long-name="WLAN Settings UI">
+ <unit bldFile="/sf/mw/wirelessacc/wlanutilities/wlansettingsui/group"/>
+ </component>
+ <component name="wlansniffer" filter="s60" long-name="WLAN Sniffer">
+ <unit bldFile="/sf/mw/wirelessacc/wlanutilities/wlansniffer/group"/>
+ </component>
+ <component name="wlanindicatorplugin" filter="s60" long-name="WLAN Indicator Plugin" plugin="Y">
+ <unit bldFile="/sf/mw/wirelessacc/wlanutilities/wlanindicatorplugin/group"/>
+ </component>
+ </collection>
+ <collection name="wirelessacc_info" long-name="Wireless Access Info" level="ui">
+ <component name="hsfw_plat" long-name="HotSpot Framework Platform Interfaces" filter="s60" class="api">
+ <unit bldFile="/sf/mw/wirelessacc/hsfw_plat/group"/>
+ </component>
+ </collection>
+ </block>
+ </layer>
+ </systemModel>
</SystemDefinition>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/symbian3/mw/wirelessacc/package_definition_3.0.xml Mon Feb 15 18:25:55 2010 +0000
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<SystemDefinition schema="3.0.0">
+ <package id="wirelessacc" name="Wireless Access" levels="framework generic ui">
+ <collection id="hotspotfw" name="HotSpot Framework" level="framework">
+ <component id="hsserver" filter="s60" name="HotSpot Server">
+ <!-- needs bld.inf extracted from the hotspotfw/group one, or this component should be removed-->
+ </component>
+ <component id="hsclient" filter="s60" name="HotSpot Client">
+ <!-- needs bld.inf extracted from the hotspotfw/group one, or this component should be removed-->
+ </component>
+ <component id="internetconnectivitytestservice" filter="s60" name="Internet Connectivity Test Service">
+ <!-- needs bld.inf un-#included from hotspotfw/group/bld.inf, or this component should be removed-->
+ <!-- <unit bldFile="hotspotfw/internetconnectivitytestservice/group"/> -->
+ </component>
+ <component id="ictsdialogs" filter="s60" name="Internet Connectivity Test Service Dialogs" deprecated="^3">
+ <!-- needs bld.inf un-#included from hotspotfw/group/bld.inf, or this component should be removed-->
+ <!-- <unit bldFile="hotspotfw/ictsdialogs/group"/> -->
+ </component>
+ <component id="hspluginforagent" filter="s60" name="HotSpot Plugin for Agent" class="plugin">
+ <!-- needs bld.inf un-#included from hotspotfw/group/bld.inf, or this component should be removed-->
+ <!-- <unit bldFile="hotspotfw/hspluginforagent/group"/> -->
+ </component>
+ <component id="hsbrowser" filter="s60" name="HotSpot Browser">
+ <!-- needs bld.inf un-#included from hotspotfw/group/bld.inf, or this component should be removed-->
+ <!-- <unit bldFile="hotspotfw/hsbrowser/group"/> -->
+ </component>
+ <component id="hotspotfw_build" filter="s60" name="Hotspot Framework Build">
+ <!-- should break up this bld.inf into the above components, or collapse them all into a single component -->
+ <unit bldFile="hotspotfw/group"/>
+ </component>
+ </collection>
+ <collection id="wlanutilities" name="WLAN Utilities" level="generic">
+ <component id="wlanplugin" filter="s60" name="WLAN Plugin" class="plugin">
+ <unit bldFile="wlanutilities/wlanplugin/group"/>
+ </component>
+ <component id="wlansettingsui" filter="s60" name="WLAN Settings UI">
+ <unit bldFile="wlanutilities/wlansettingsui/group"/>
+ </component>
+ <component id="wlansniffer" filter="s60" name="WLAN Sniffer">
+ <unit bldFile="wlanutilities/wlansniffer/group"/>
+ </component>
+ <component id="wlanindicatorplugin" filter="s60" name="WLAN Indicator Plugin" class="plugin">
+ <unit bldFile="wlanutilities/wlanindicatorplugin/group"/>
+ </component>
+ </collection>
+ <collection id="wirelessacc_info" name="Wireless Access Info" level="ui">
+ <component id="hsfw_plat" name="HotSpot Framework Platform Interfaces" filter="s60" class="api">
+ <unit bldFile="hsfw_plat/group"/>
+ </component>
+ </collection>
+ </package>
+</SystemDefinition>
--- a/symbian3/os/boardsupport/package_definition.xml Fri Feb 12 16:37:22 2010 +0000
+++ b/symbian3/os/boardsupport/package_definition.xml Mon Feb 15 18:25:55 2010 +0000
@@ -1,119 +1,98 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE SystemDefinition [
- <!ELEMENT SystemDefinition (systemModel?,SystemBuild?)>
- <!ATTLIST SystemDefinition
- name CDATA #REQUIRED
- schema CDATA #REQUIRED>
- <!ELEMENT systemModel (layer+)>
- <!ELEMENT layer (block*|collection*)*>
- <!ATTLIST layer
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED
- levels NMTOKENS #IMPLIED
- span CDATA #IMPLIED>
- <!ELEMENT block (subblock*|collection*)*>
- <!ATTLIST block
- levels NMTOKENS #IMPLIED
- span CDATA #IMPLIED
- level NMTOKEN #IMPLIED
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED>
- <!ELEMENT subblock (collection)*>
- <!ATTLIST subblock
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED>
- <!ELEMENT collection (component)*>
- <!ATTLIST collection
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED
- level NMTOKEN #IMPLIED>
- <!ELEMENT component (unit)*>
- <!ATTLIST component
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED
- deprecated CDATA #IMPLIED
- introduced CDATA #IMPLIED
- contract CDATA #IMPLIED
- plugin (Y|N) 'N'
- filter CDATA #IMPLIED
- class NMTOKENS #IMPLIED
- supports CDATA #IMPLIED
- purpose (optional|mandatory|development) 'optional'>
- <!ELEMENT unit EMPTY>
- <!ATTLIST unit
- mrp CDATA #IMPLIED
- filter CDATA #IMPLIED
- bldFile CDATA #IMPLIED
- root CDATA #IMPLIED
- version NMTOKEN #IMPLIED
- prebuilt NMTOKEN #IMPLIED
- late (Y|N) #IMPLIED
- priority CDATA #IMPLIED>
- <!ELEMENT SystemBuild (option*|target+|targetList+|list+|configuration+)*>
- <!ATTLIST SystemBuild schema CDATA #REQUIRED>
- <!ELEMENT list (ref+)>
- <!ATTLIST list
- name ID #REQUIRED
- description CDATA #REQUIRED>
- <!ELEMENT ref EMPTY>
- <!ATTLIST ref item CDATA #REQUIRED>
- <!ELEMENT targetList EMPTY>
- <!ATTLIST targetList
- name ID #REQUIRED
- description CDATA #REQUIRED
- target IDREFS #REQUIRED>
- <!ELEMENT target EMPTY>
- <!ATTLIST target
- name ID #REQUIRED
- abldTarget CDATA #REQUIRED
- description CDATA #REQUIRED>
- <!ELEMENT option EMPTY>
- <!ATTLIST option
- name ID #REQUIRED
- abldOption CDATA #REQUIRED
- description CDATA #REQUIRED
- enable (Y|N) #REQUIRED>
- <!ELEMENT configuration (listRef+|ref+|task+)*>
- <!ATTLIST configuration
- name ID #REQUIRED
- description CDATA #REQUIRED
- filter CDATA #REQUIRED>
- <!ELEMENT task (listRef*,(buildLayer|specialInstructions))>
- <!ELEMENT listRef EMPTY>
- <!ATTLIST listRef list CDATA #REQUIRED>
- <!ELEMENT buildLayer EMPTY>
- <!ATTLIST buildLayer
- command CDATA #REQUIRED
- targetList IDREFS #IMPLIED
- unitParallel (Y|N) #REQUIRED
- targetParallel (Y|N) 'N'>
- <!ELEMENT specialInstructions EMPTY>
- <!ATTLIST specialInstructions
- name CDATA #REQUIRED
- cwd CDATA #REQUIRED
- root CDATA #IMPLIED
- command CDATA #REQUIRED>
-]>
-<SystemDefinition schema="2.0.1" name="Symbian^3">
-<systemModel>
-<layer name="os" long-name="OS" levels="hw services">
-<block name="boardsupport" level="hw" long-name="Board Support" levels="bsp test 2 3 config">
-<collection name="emulator" long-name="Emulator" level="bsp">
-<component name="emulatorbsp" long-name="Emulator BSP" purpose="optional">
-<unit bldFile="/sf/os/boardsupport/emulator/emulatorbsp" mrp="/sf/os/boardsupport/emulator/emulatorbsp/base_wins.mrp"/>
-</component>
-</collection>
-<collection name="haitest" long-name="HAI Test Suites" level="test">
-<component name="bspsvs" long-name="BSP Verification Suite" introduced="tb91" purpose="development">
-<unit mrp="/sf/os/boardsupport/haitest/bspsvs/group/bspsvs.mrp"/>
-</component>
-</collection>
-<collection name="boardsupport_info" long-name="Board Support Info" level="config">
-<component name="boardsupport_metadata" long-name="Board Support Metadata" introduced="tb91" purpose="development" class="config PC">
-<unit mrp="/sf/os/boardsupport/boardsupport_info/boardsupport_metadata/boardsupport_metadata.mrp"/>
-</component>
-</collection>
-</block>
-</layer>
-</systemModel>
-</SystemDefinition>
\ No newline at end of file
+<!DOCTYPE SystemDefinition [
+<!ELEMENT SystemDefinition ( systemModel )>
+<!ATTLIST SystemDefinition
+ name CDATA #REQUIRED
+ schema CDATA #REQUIRED
+>
+<!-- all paths are relative to the environment variable specified by the root attribute, or SOURCEROOT if not. -->
+
+<!-- System Model Section of DTD -->
+<!ELEMENT systemModel (layer+)>
+
+<!ELEMENT layer (block* | collection*)*>
+<!-- Kernel Services, Base Services, OS Services, Etc -->
+<!ATTLIST layer
+ name CDATA #REQUIRED
+ long-name CDATA #IMPLIED
+ levels NMTOKENS #IMPLIED
+ span CDATA #IMPLIED
+>
+
+<!ELEMENT block (subblock* | collection*)*>
+ <!-- Generic OS services, Comms Services, etc -->
+<!ATTLIST block
+ levels NMTOKENS #IMPLIED
+ span CDATA #IMPLIED
+ level NMTOKEN #IMPLIED
+ name CDATA #REQUIRED
+ long-name CDATA #IMPLIED
+>
+
+<!ELEMENT subblock (collection)*>
+<!-- Cellular Baseband Services, Networking Services, etc -->
+<!ATTLIST subblock
+ name CDATA #REQUIRED
+ long-name CDATA #IMPLIED
+>
+
+<!ELEMENT collection (component)*>
+<!-- Screen Driver, Content Handling, etc -->
+<!ATTLIST collection
+ name CDATA #REQUIRED
+ long-name CDATA #IMPLIED
+ level NMTOKEN #IMPLIED
+>
+
+<!ELEMENT component (unit)*>
+<!-- contains units or is a package or prebuilt -->
+<!ATTLIST component
+ name CDATA #REQUIRED
+ long-name CDATA #IMPLIED
+ deprecated CDATA #IMPLIED
+ introduced CDATA #IMPLIED
+ contract CDATA #IMPLIED
+ plugin (Y|N) "N"
+ filter CDATA #IMPLIED
+ class NMTOKENS #IMPLIED
+ supports CDATA #IMPLIED
+ purpose ( optional | mandatory | development ) "optional"
+>
+
+<!ELEMENT unit EMPTY >
+<!-- must be buildable (bld.inf) -->
+<!-- bldFile may someday be removed in favour of mrp -->
+<!ATTLIST unit
+ mrp CDATA #IMPLIED
+ filter CDATA #IMPLIED
+ bldFile CDATA #IMPLIED
+ root CDATA #IMPLIED
+ version NMTOKEN #IMPLIED
+ prebuilt NMTOKEN #IMPLIED
+ late (Y|N) #IMPLIED
+ priority CDATA #IMPLIED
+>
+]>
+<SystemDefinition name="Symbian^3" schema="2.0.1">
+ <systemModel>
+ <layer name="os" long-name="OS" levels="hw services">
+ <block name="boardsupport" level="hw" long-name="Board Support" levels="bsp test 2 3 config">
+ <collection name="emulator" long-name="Emulator" level="bsp">
+ <component name="emulatorbsp" long-name="Emulator BSP" purpose="optional">
+ <unit bldFile="/sf/os/boardsupport/emulator/emulatorbsp" mrp="/sf/os/boardsupport/emulator/emulatorbsp/base_wins.mrp"/>
+ </component>
+ </collection>
+ <collection name="haitest" long-name="HAI Test Suites" level="test">
+ <component name="bspsvs" long-name="BSP Verification Suite" introduced="^2" purpose="development">
+ <unit mrp="/sf/os/boardsupport/haitest/bspsvs/group/bspsvs.mrp"/>
+ </component>
+ </collection>
+ <collection name="boardsupport_info" long-name="Board Support Info" level="config">
+ <component name="boardsupport_metadata" long-name="Board Support Metadata" introduced="^2" purpose="development" class="config PC">
+ <unit mrp="/sf/os/boardsupport/boardsupport_info/boardsupport_metadata/boardsupport_metadata.mrp"/>
+ </component>
+ </collection>
+ </block>
+ </layer>
+ </systemModel>
+</SystemDefinition>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/symbian3/os/boardsupport/package_definition_3.0.xml Mon Feb 15 18:25:55 2010 +0000
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<SystemDefinition schema="3.0.0">
+ <package id="boardsupport" name="Board Support" levels="bsp test 2 3 config">
+ <collection id="emulator" name="Emulator" level="bsp">
+ <component id="emulatorbsp" name="Emulator BSP" purpose="optional">
+ <unit bldFile="emulator/emulatorbsp" mrp="emulator/emulatorbsp/base_wins.mrp"/>
+ </component>
+ </collection>
+ <collection id="haitest" name="HAI Test Suites" level="test">
+ <component id="bspsvs" name="BSP Verification Suite" introduced="^2" purpose="development">
+ <unit mrp="haitest/bspsvs/group/bspsvs.mrp"/>
+ </component>
+ </collection>
+ <collection id="boardsupport_info" name="Board Support Info" level="config">
+ <component id="boardsupport_metadata" name="Board Support Metadata" class="config" introduced="^2" purpose="development" target="desktop">
+ <unit mrp="boardsupport_info/boardsupport_metadata/boardsupport_metadata.mrp"/>
+ </component>
+ </collection>
+ </package>
+</SystemDefinition>
--- a/symbian3/os/bt/package_definition.xml Fri Feb 12 16:37:22 2010 +0000
+++ b/symbian3/os/bt/package_definition.xml Mon Feb 15 18:25:55 2010 +0000
@@ -1,182 +1,166 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE SystemDefinition [
- <!ELEMENT SystemDefinition (systemModel?,SystemBuild?)>
- <!ATTLIST SystemDefinition
- name CDATA #REQUIRED
- schema CDATA #REQUIRED>
- <!ELEMENT systemModel (layer+)>
- <!ELEMENT layer (block*|collection*)*>
- <!ATTLIST layer
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED
- levels NMTOKENS #IMPLIED
- span CDATA #IMPLIED>
- <!ELEMENT block (subblock*|collection*)*>
- <!ATTLIST block
- levels NMTOKENS #IMPLIED
- span CDATA #IMPLIED
- level NMTOKEN #IMPLIED
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED>
- <!ELEMENT subblock (collection)*>
- <!ATTLIST subblock
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED>
- <!ELEMENT collection (component)*>
- <!ATTLIST collection
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED
- level NMTOKEN #IMPLIED>
- <!ELEMENT component (unit)*>
- <!ATTLIST component
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED
- deprecated CDATA #IMPLIED
- introduced CDATA #IMPLIED
- contract CDATA #IMPLIED
- plugin (Y|N) 'N'
- filter CDATA #IMPLIED
- class NMTOKENS #IMPLIED
- supports CDATA #IMPLIED
- purpose (optional|mandatory|development) 'optional'>
- <!ELEMENT unit EMPTY>
- <!ATTLIST unit
- mrp CDATA #IMPLIED
- filter CDATA #IMPLIED
- bldFile CDATA #IMPLIED
- root CDATA #IMPLIED
- version NMTOKEN #IMPLIED
- prebuilt NMTOKEN #IMPLIED
- late (Y|N) #IMPLIED
- priority CDATA #IMPLIED>
- <!ELEMENT SystemBuild (option*|target+|targetList+|list+|configuration+)*>
- <!ATTLIST SystemBuild schema CDATA #REQUIRED>
- <!ELEMENT list (ref+)>
- <!ATTLIST list
- name ID #REQUIRED
- description CDATA #REQUIRED>
- <!ELEMENT ref EMPTY>
- <!ATTLIST ref item CDATA #REQUIRED>
- <!ELEMENT targetList EMPTY>
- <!ATTLIST targetList
- name ID #REQUIRED
- description CDATA #REQUIRED
- target IDREFS #REQUIRED>
- <!ELEMENT target EMPTY>
- <!ATTLIST target
- name ID #REQUIRED
- abldTarget CDATA #REQUIRED
- description CDATA #REQUIRED>
- <!ELEMENT option EMPTY>
- <!ATTLIST option
- name ID #REQUIRED
- abldOption CDATA #REQUIRED
- description CDATA #REQUIRED
- enable (Y|N) #REQUIRED>
- <!ELEMENT configuration (listRef+|ref+|task+)*>
- <!ATTLIST configuration
- name ID #REQUIRED
- description CDATA #REQUIRED
- filter CDATA #REQUIRED>
- <!ELEMENT task (listRef*,(buildLayer|specialInstructions))>
- <!ELEMENT listRef EMPTY>
- <!ATTLIST listRef list CDATA #REQUIRED>
- <!ELEMENT buildLayer EMPTY>
- <!ATTLIST buildLayer
- command CDATA #REQUIRED
- targetList IDREFS #IMPLIED
- unitParallel (Y|N) #REQUIRED
- targetParallel (Y|N) 'N'>
- <!ELEMENT specialInstructions EMPTY>
- <!ATTLIST specialInstructions
- name CDATA #REQUIRED
- cwd CDATA #REQUIRED
- root CDATA #IMPLIED
- command CDATA #REQUIRED>
-]>
-<SystemDefinition schema="2.0.1" name="Symbian^3">
-<systemModel>
-<layer name="os" long-name="OS" levels="hw services">
-<block name="bt" level="services" long-name="Bluetooth" levels="adaptation hw-if plugin framework server app-if">
-<collection name="bluetooth" long-name="Bluetooth Core" level="framework">
-<component name="btstack" long-name="Bluetooth Stack" introduced="6.0" purpose="optional">
-<unit bldFile="/sf/os/bt/bluetooth/btstack" mrp="/sf/os/bt/bluetooth/btstack/bluetooth_stack.mrp"/>
-</component>
-<component name="btcomm" long-name="Bluetooth CSY" introduced="6.0" purpose="optional" plugin="Y">
-<unit bldFile="/sf/os/bt/bluetooth/btcomm" mrp="/sf/os/bt/bluetooth/btcomm/bluetooth_btcomm.mrp"/>
-</component>
-<component name="btsdp" long-name="Bluetooth SDP" introduced="6.1" purpose="optional">
-<unit bldFile="/sf/os/bt/bluetooth/btsdp" mrp="/sf/os/bt/bluetooth/btsdp/bluetooth_sdp.mrp"/>
-</component>
-<component name="btextnotifiers" long-name="Bluetooth Notifiers Support" introduced="6.1" purpose="optional">
-<unit bldFile="/sf/os/bt/bluetooth/btextnotifiers" mrp="/sf/os/bt/bluetooth/btextnotifiers/bluetooth_btextnotifiers.mrp"/>
-</component>
-<component name="gavdp" long-name="Bluetooth GAVDP" introduced="8.1" purpose="optional">
-<unit bldFile="/sf/os/bt/bluetooth/gavdp/group" mrp="/sf/os/bt/bluetooth/gavdp/group/bluetooth_gavdp.mrp"/>
-</component>
-<component name="btexample" long-name="Bluetooth Examples and Tests" introduced="6.1" purpose="development">
-<unit mrp="/sf/os/bt/bluetooth/btexample/test/bluetooth_tests_examples.mrp"/>
-</component>
-<component name="btlogger" long-name="Bluetooth Logging Engine" introduced="9.2" purpose="optional">
-<unit bldFile="/sf/os/bt/bluetooth/btlogger/group" mrp="/sf/os/bt/bluetooth/btlogger/group/bluetooth_logger.mrp"/>
-</component>
-<component name="btdocs" long-name="Bluetooth Documentation" purpose="development" class="doc">
-<unit mrp="/sf/os/bt/bluetooth/btdocs/bluetooth_documentation.mrp"/>
-</component>
-</collection>
-<collection name="bluetoothmgmt" long-name="Bluetooth Management" level="plugin">
-<component name="btmgr" long-name="Bluetooth Manager" introduced="6.0" purpose="optional">
-<unit bldFile="/sf/os/bt/bluetoothmgmt/btmgr" mrp="/sf/os/bt/bluetoothmgmt/btmgr/bluetooth_manager.mrp"/>
-</component>
-<component name="btconfig" long-name="Bluetooth Config" purpose="optional" class="config">
-<unit bldFile="/sf/os/bt/bluetoothmgmt/btconfig" mrp="/sf/os/bt/bluetoothmgmt/btconfig/bluetooth_config.mrp"/>
-</component>
-<component name="btrom" long-name="Bluetooth ROM" introduced="9.1" purpose="optional">
-<unit bldFile="/sf/os/bt/bluetoothmgmt/btrom" mrp="/sf/os/bt/bluetoothmgmt/btrom/bluetooth_rom.mrp"/>
-</component>
-<component name="bluetoothclientlib" long-name="Bluetooth Client Library" introduced="6.0" purpose="optional">
-<unit bldFile="/sf/os/bt/bluetoothmgmt/bluetoothclientlib" mrp="/sf/os/bt/bluetoothmgmt/bluetoothclientlib/bluetooth_user.mrp"/>
-</component>
-<component name="btcommon" long-name="Bluetooth Build Utilities" purpose="optional">
-<unit mrp="/sf/os/bt/bluetoothmgmt/btcommon/bluetooth_common.mrp"/>
-</component>
-</collection>
-<collection name="bluetoothcommsprofiles" long-name="Bluetooth Comms Profiles" level="app-if">
-<component name="btpan" long-name="Bluetooth PAN Profile" introduced="8.1" purpose="optional" plugin="Y">
-<unit bldFile="/sf/os/bt/bluetoothcommsprofiles/btpan/group" mrp="/sf/os/bt/bluetoothcommsprofiles/btpan/group/bluetooth_pan.mrp"/>
-</component>
-</collection>
-<collection name="bthci" long-name="Host Controller Interface" level="server">
-<component name="bthci2" long-name="Bluetooth HCI Framework 2" introduced="9.2" purpose="optional">
-<unit bldFile="/sf/os/bt/bthci/bthci2/group" mrp="/sf/os/bt/bthci/bthci2/group/bluetooth_hci_v2_framework.mrp"/>
-</component>
-<component name="hciextensioninterface" long-name="Bluetooth HCI Extension Interface" introduced="6.1" purpose="optional">
-<unit bldFile="/sf/os/bt/bthci/hciextensioninterface" mrp="/sf/os/bt/bthci/hciextensioninterface/bluetooth_hciproxy.mrp"/>
-</component>
-<component name="hci2implementations" long-name="Bluetooth HCI 2 Reference Implementations" introduced="9.2" purpose="optional" plugin="Y">
-<unit bldFile="/sf/os/bt/bthci/hci2implementations/group" mrp="/sf/os/bt/bthci/hci2implementations/group/bluetooth_hci_v2_implementations.mrp"/>
-</component>
-</collection>
-<collection name="irda" long-name="IrDA" level="plugin">
-<component name="irdastack" long-name="IrDA Stack" purpose="optional">
-<unit bldFile="/sf/os/bt/irda/irdastack/group" mrp="/sf/os/bt/irda/irdastack/group/infra-red_irda.mrp"/>
-</component>
-</collection>
-<collection name="bluetoothapitest" long-name="Bluetooth API Tests" level="app-if">
-<component name="bluetoothsvs" long-name="Bluetooth Verification Suite" introduced="tb92" purpose="development">
-<unit mrp="/sf/os/bt/bluetoothapitest/bluetoothsvs/group/bluetoothsvs.mrp"/>
-</component>
-</collection>
-<collection name="bt_info" long-name="Bluetooth Info" level="app-if">
-<!-- MattD 20091102 - Added manually to stop build failures... Probably an S60 component -->
- <component name="bt_plat" filter="s60" class="api">
- <unit bldFile="/sf/os/bt/bt_plat/group"/>
- </component>
-<component name="bt_metadata" long-name="Bluetooth Metadata" introduced="tb92" purpose="development" class="config PC">
-<unit mrp="/sf/os/bt/bt_info/bt_metadata/bt_metadata.mrp"/>
-</component>
-</collection>
-</block>
-</layer>
-</systemModel>
-</SystemDefinition>
\ No newline at end of file
+<!DOCTYPE SystemDefinition [
+<!ELEMENT SystemDefinition ( systemModel )>
+<!ATTLIST SystemDefinition
+ name CDATA #REQUIRED
+ schema CDATA #REQUIRED
+>
+<!-- all paths are relative to the environment variable specified by the root attribute, or SOURCEROOT if not. -->
+
+<!-- System Model Section of DTD -->
+<!ELEMENT systemModel (layer+)>
+
+<!ELEMENT layer (block* | collection*)*>
+<!-- Kernel Services, Base Services, OS Services, Etc -->
+<!ATTLIST layer
+ name CDATA #REQUIRED
+ long-name CDATA #IMPLIED
+ levels NMTOKENS #IMPLIED
+ span CDATA #IMPLIED
+>
+
+<!ELEMENT block (subblock* | collection*)*>
+ <!-- Generic OS services, Comms Services, etc -->
+<!ATTLIST block
+ levels NMTOKENS #IMPLIED
+ span CDATA #IMPLIED
+ level NMTOKEN #IMPLIED
+ name CDATA #REQUIRED
+ long-name CDATA #IMPLIED
+>
+
+<!ELEMENT subblock (collection)*>
+<!-- Cellular Baseband Services, Networking Services, etc -->
+<!ATTLIST subblock
+ name CDATA #REQUIRED
+ long-name CDATA #IMPLIED
+>
+
+<!ELEMENT collection (component)*>
+<!-- Screen Driver, Content Handling, etc -->
+<!ATTLIST collection
+ name CDATA #REQUIRED
+ long-name CDATA #IMPLIED
+ level NMTOKEN #IMPLIED
+>
+
+<!ELEMENT component (unit)*>
+<!-- contains units or is a package or prebuilt -->
+<!ATTLIST component
+ name CDATA #REQUIRED
+ long-name CDATA #IMPLIED
+ deprecated CDATA #IMPLIED
+ introduced CDATA #IMPLIED
+ contract CDATA #IMPLIED
+ plugin (Y|N) "N"
+ filter CDATA #IMPLIED
+ class NMTOKENS #IMPLIED
+ supports CDATA #IMPLIED
+ purpose ( optional | mandatory | development ) "optional"
+>
+
+<!ELEMENT unit EMPTY >
+<!-- must be buildable (bld.inf) -->
+<!-- bldFile may someday be removed in favour of mrp -->
+<!ATTLIST unit
+ mrp CDATA #IMPLIED
+ filter CDATA #IMPLIED
+ bldFile CDATA #IMPLIED
+ root CDATA #IMPLIED
+ version NMTOKEN #IMPLIED
+ prebuilt NMTOKEN #IMPLIED
+ late (Y|N) #IMPLIED
+ priority CDATA #IMPLIED
+>
+]>
+<SystemDefinition name="Symbian^3" schema="2.0.1">
+ <systemModel>
+ <layer name="os" long-name="OS" levels="hw services">
+ <block name="bt" level="services" long-name="Bluetooth" levels="adaptation hw-if plugin framework server app-if">
+ <collection name="bluetooth" long-name="Bluetooth Core" level="framework">
+ <component name="btstack" long-name="Bluetooth Stack" introduced="6.0" purpose="optional">
+ <unit bldFile="/sf/os/bt/bluetooth/btstack" mrp="/sf/os/bt/bluetooth/btstack/bluetooth_stack.mrp"/>
+ </component>
+ <component name="btcomm" long-name="Bluetooth CSY" introduced="6.0" purpose="optional" plugin="Y">
+ <unit bldFile="/sf/os/bt/bluetooth/btcomm" mrp="/sf/os/bt/bluetooth/btcomm/bluetooth_btcomm.mrp"/>
+ </component>
+ <component name="btsdp" long-name="Bluetooth SDP" introduced="6.1" purpose="optional">
+ <unit bldFile="/sf/os/bt/bluetooth/btsdp" mrp="/sf/os/bt/bluetooth/btsdp/bluetooth_sdp.mrp"/>
+ </component>
+ <component name="btextnotifiers" long-name="Bluetooth Notifiers Support" introduced="6.1" purpose="optional">
+ <unit bldFile="/sf/os/bt/bluetooth/btextnotifiers" mrp="/sf/os/bt/bluetooth/btextnotifiers/bluetooth_btextnotifiers.mrp"/>
+ </component>
+ <component name="gavdp" long-name="Bluetooth GAVDP" introduced="8.1" purpose="optional">
+ <unit bldFile="/sf/os/bt/bluetooth/gavdp/group" mrp="/sf/os/bt/bluetooth/gavdp/group/bluetooth_gavdp.mrp"/>
+ </component>
+ <component name="btexample" long-name="Bluetooth Examples and Tests" introduced="6.1" purpose="development" filter="test">
+ <unit mrp="/sf/os/bt/bluetooth/btexample/test/bluetooth_tests_examples.mrp" bldFile="/sf/os/bt/bluetooth/btexample/test/group"/>
+ </component>
+ <component name="btlogger" long-name="Bluetooth Logging Engine" introduced="9.2" purpose="optional">
+ <unit bldFile="/sf/os/bt/bluetooth/btlogger/group" mrp="/sf/os/bt/bluetooth/btlogger/group/bluetooth_logger.mrp"/>
+ </component>
+ <component name="btdocs" long-name="Bluetooth Documentation" purpose="development" class="doc">
+ <unit mrp="/sf/os/bt/bluetooth/btdocs/bluetooth_documentation.mrp"/>
+ </component>
+ </collection>
+ <collection name="bluetoothmgmt" long-name="Bluetooth Management" level="plugin">
+ <component name="btmgr" long-name="Bluetooth Manager" introduced="6.0" purpose="optional">
+ <unit bldFile="/sf/os/bt/bluetoothmgmt/btmgr" mrp="/sf/os/bt/bluetoothmgmt/btmgr/bluetooth_manager.mrp"/>
+ </component>
+ <component name="btconfig" long-name="Bluetooth Config" purpose="optional" class="config">
+ <unit bldFile="/sf/os/bt/bluetoothmgmt/btconfig" mrp="/sf/os/bt/bluetoothmgmt/btconfig/bluetooth_config.mrp"/>
+ </component>
+ <component name="btrom" long-name="Bluetooth ROM" introduced="9.1" purpose="optional">
+ <unit bldFile="/sf/os/bt/bluetoothmgmt/btrom" mrp="/sf/os/bt/bluetoothmgmt/btrom/bluetooth_rom.mrp"/>
+ </component>
+ <component name="bluetoothclientlib" long-name="Bluetooth Client Library" introduced="6.0" purpose="optional">
+ <unit bldFile="/sf/os/bt/bluetoothmgmt/bluetoothclientlib" mrp="/sf/os/bt/bluetoothmgmt/bluetoothclientlib/bluetooth_user.mrp"/>
+ </component>
+ <component name="btcommon" long-name="Bluetooth Build Utilities" purpose="optional" filter="test">
+ <unit mrp="/sf/os/bt/bluetoothmgmt/btcommon/bluetooth_common.mrp" bldFile="/sf/os/bt/bluetoothmgmt/btcommon"/>
+ </component>
+ </collection>
+ <collection name="bluetoothcommsprofiles" long-name="Bluetooth Comms Profiles" level="app-if">
+ <component name="btpan" long-name="Bluetooth PAN Profile" introduced="8.1" purpose="optional" plugin="Y">
+ <unit bldFile="/sf/os/bt/bluetoothcommsprofiles/btpan/group" mrp="/sf/os/bt/bluetoothcommsprofiles/btpan/group/bluetooth_pan.mrp"/>
+ </component>
+ </collection>
+ <collection name="bthci" long-name="Host Controller Interface" level="server">
+ <component name="bthci2" long-name="Bluetooth HCI Framework 2" introduced="9.2" purpose="optional">
+ <unit bldFile="/sf/os/bt/bthci/bthci2/group" mrp="/sf/os/bt/bthci/bthci2/group/bluetooth_hci_v2_framework.mrp"/>
+ </component>
+ <component name="hciextensioninterface" long-name="Bluetooth HCI Extension Interface" introduced="6.1" purpose="optional">
+ <unit bldFile="/sf/os/bt/bthci/hciextensioninterface" mrp="/sf/os/bt/bthci/hciextensioninterface/bluetooth_hciproxy.mrp"/>
+ </component>
+ <component name="hci2implementations" long-name="Bluetooth HCI 2 Reference Implementations" introduced="9.2" purpose="optional" plugin="Y">
+ <unit bldFile="/sf/os/bt/bthci/hci2implementations/group" mrp="/sf/os/bt/bthci/hci2implementations/group/bluetooth_hci_v2_implementations.mrp"/>
+ </component>
+ </collection>
+ <collection name="irda" long-name="IrDA" level="plugin">
+ <component name="irdastack" long-name="IrDA Stack" purpose="optional">
+ <unit bldFile="/sf/os/bt/irda/irdastack/group" mrp="/sf/os/bt/irda/irdastack/group/infra-red_irda.mrp"/>
+ </component>
+ </collection>
+ <collection name="bluetoothapitest" long-name="Bluetooth API Tests" level="app-if">
+ <component name="bluetoothsvs" long-name="Bluetooth Verification Suite" introduced="^3" purpose="development" filter="test">
+ <unit mrp="/sf/os/bt/bluetoothapitest/bluetoothsvs/group/bluetoothsvs.mrp" bldFile="/sf/os/bt/bluetoothapitest/bluetoothsvs/group"/>
+ </component>
+ </collection>
+ <collection name="atext" long-name="AT Extensions" level="server">
+ <!-- collection is really a component. Need to move down a directory -->
+ <component name="atext_build" long-name="AT Extension Build" introduced="^3" purpose="optional" filter="s60">
+ <unit bldFile="/sf/os/bt/atext/group"/>
+ </component>
+ </collection>
+ <collection name="bt_info" long-name="Bluetooth Info" level="app-if">
+ <component name="bt_plat" filter="s60" class="api">
+ <unit bldFile="/sf/os/bt/bt_plat/group"/>
+ </component>
+ <component name="bt_metadata" long-name="Bluetooth Metadata" introduced="^3" purpose="development" class="config PC">
+ <unit mrp="/sf/os/bt/bt_info/bt_metadata/bt_metadata.mrp"/>
+ </component>
+ </collection>
+ </block>
+ </layer>
+ </systemModel>
+</SystemDefinition>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/symbian3/os/bt/package_definition_3.0.xml Mon Feb 15 18:25:55 2010 +0000
@@ -0,0 +1,88 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<SystemDefinition schema="3.0.0">
+ <package id="bt" name="Bluetooth" levels="adaptation hw-if plugin framework server app-if">
+ <collection id="bluetooth" name="Bluetooth Core" level="framework">
+ <component id="btstack" name="Bluetooth Stack" introduced="6.0" purpose="optional">
+ <unit bldFile="bluetooth/btstack" mrp="bluetooth/btstack/bluetooth_stack.mrp"/>
+ </component>
+ <component id="btcomm" name="Bluetooth CSY" introduced="6.0" purpose="optional" class="plugin">
+ <unit bldFile="bluetooth/btcomm" mrp="bluetooth/btcomm/bluetooth_btcomm.mrp"/>
+ </component>
+ <component id="btsdp" name="Bluetooth SDP" introduced="6.1" purpose="optional">
+ <unit bldFile="bluetooth/btsdp" mrp="bluetooth/btsdp/bluetooth_sdp.mrp"/>
+ </component>
+ <component id="btextnotifiers" name="Bluetooth Notifiers Support" introduced="6.1" purpose="optional">
+ <unit bldFile="bluetooth/btextnotifiers" mrp="bluetooth/btextnotifiers/bluetooth_btextnotifiers.mrp"/>
+ </component>
+ <component id="gavdp" name="Bluetooth GAVDP" introduced="8.1" purpose="optional">
+ <unit bldFile="bluetooth/gavdp/group" mrp="bluetooth/gavdp/group/bluetooth_gavdp.mrp"/>
+ </component>
+ <component id="btexample" name="Bluetooth Examples and Tests" introduced="6.1" purpose="development" filter="test">
+ <unit mrp="bluetooth/btexample/test/bluetooth_tests_examples.mrp" bldFile="bluetooth/btexample/test/group"/>
+ </component>
+ <component id="btlogger" name="Bluetooth Logging Engine" introduced="9.2" purpose="optional">
+ <unit bldFile="bluetooth/btlogger/group" mrp="bluetooth/btlogger/group/bluetooth_logger.mrp"/>
+ </component>
+ <component id="btdocs" name="Bluetooth Documentation" purpose="development" class="doc">
+ <unit mrp="bluetooth/btdocs/bluetooth_documentation.mrp"/>
+ </component>
+ </collection>
+ <collection id="bluetoothmgmt" name="Bluetooth Management" level="plugin">
+ <component id="btmgr" name="Bluetooth Manager" introduced="6.0" purpose="optional">
+ <unit bldFile="bluetoothmgmt/btmgr" mrp="bluetoothmgmt/btmgr/bluetooth_manager.mrp"/>
+ </component>
+ <component id="btconfig" name="Bluetooth Config" purpose="optional" class="config">
+ <unit bldFile="bluetoothmgmt/btconfig" mrp="bluetoothmgmt/btconfig/bluetooth_config.mrp"/>
+ </component>
+ <component id="btrom" name="Bluetooth ROM" introduced="9.1" purpose="optional">
+ <unit bldFile="bluetoothmgmt/btrom" mrp="bluetoothmgmt/btrom/bluetooth_rom.mrp"/>
+ </component>
+ <component id="bluetoothclientlib" name="Bluetooth Client Library" introduced="6.0" purpose="optional">
+ <unit bldFile="bluetoothmgmt/bluetoothclientlib" mrp="bluetoothmgmt/bluetoothclientlib/bluetooth_user.mrp"/>
+ </component>
+ <component id="btcommon" name="Bluetooth Build Utilities" purpose="optional" filter="test">
+ <unit mrp="bluetoothmgmt/btcommon/bluetooth_common.mrp" bldFile="bluetoothmgmt/btcommon"/>
+ </component>
+ </collection>
+ <collection id="bluetoothcommsprofiles" name="Bluetooth Comms Profiles" level="app-if">
+ <component id="btpan" name="Bluetooth PAN Profile" introduced="8.1" purpose="optional" class="plugin">
+ <unit bldFile="bluetoothcommsprofiles/btpan/group" mrp="bluetoothcommsprofiles/btpan/group/bluetooth_pan.mrp"/>
+ </component>
+ </collection>
+ <collection id="bthci" name="Host Controller Interface" level="server">
+ <component id="bthci2" name="Bluetooth HCI Framework 2" introduced="9.2" purpose="optional">
+ <unit bldFile="bthci/bthci2/group" mrp="bthci/bthci2/group/bluetooth_hci_v2_framework.mrp"/>
+ </component>
+ <component id="hciextensioninterface" name="Bluetooth HCI Extension Interface" introduced="6.1" purpose="optional">
+ <unit bldFile="bthci/hciextensioninterface" mrp="bthci/hciextensioninterface/bluetooth_hciproxy.mrp"/>
+ </component>
+ <component id="hci2implementations" name="Bluetooth HCI 2 Reference Implementations" introduced="9.2" purpose="optional" class="plugin">
+ <unit bldFile="bthci/hci2implementations/group" mrp="bthci/hci2implementations/group/bluetooth_hci_v2_implementations.mrp"/>
+ </component>
+ </collection>
+ <collection id="irda" name="IrDA" level="plugin">
+ <component id="irdastack" name="IrDA Stack" purpose="optional">
+ <unit bldFile="irda/irdastack/group" mrp="irda/irdastack/group/infra-red_irda.mrp"/>
+ </component>
+ </collection>
+ <collection id="bluetoothapitest" name="Bluetooth API Tests" level="app-if">
+ <component id="bluetoothsvs" name="Bluetooth Verification Suite" introduced="^3" purpose="development" filter="test">
+ <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"/>
+ </component>
+ <component id="bt_metadata" name="Bluetooth Metadata" class="config" introduced="^3" purpose="development" target="desktop">
+ <unit mrp="bt_info/bt_metadata/bt_metadata.mrp"/>
+ </component>
+ </collection>
+ </package>
+</SystemDefinition>
--- a/symbian3/os/buildtools/package_definition.xml Fri Feb 12 16:37:22 2010 +0000
+++ b/symbian3/os/buildtools/package_definition.xml Mon Feb 15 18:25:55 2010 +0000
@@ -1,166 +1,145 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE SystemDefinition [
- <!ELEMENT SystemDefinition (systemModel?,SystemBuild?)>
- <!ATTLIST SystemDefinition
- name CDATA #REQUIRED
- schema CDATA #REQUIRED>
- <!ELEMENT systemModel (layer+)>
- <!ELEMENT layer (block*|collection*)*>
- <!ATTLIST layer
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED
- levels NMTOKENS #IMPLIED
- span CDATA #IMPLIED>
- <!ELEMENT block (subblock*|collection*)*>
- <!ATTLIST block
- levels NMTOKENS #IMPLIED
- span CDATA #IMPLIED
- level NMTOKEN #IMPLIED
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED>
- <!ELEMENT subblock (collection)*>
- <!ATTLIST subblock
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED>
- <!ELEMENT collection (component)*>
- <!ATTLIST collection
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED
- level NMTOKEN #IMPLIED>
- <!ELEMENT component (unit)*>
- <!ATTLIST component
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED
- deprecated CDATA #IMPLIED
- introduced CDATA #IMPLIED
- contract CDATA #IMPLIED
- plugin (Y|N) 'N'
- filter CDATA #IMPLIED
- class NMTOKENS #IMPLIED
- supports CDATA #IMPLIED
- purpose (optional|mandatory|development) 'optional'>
- <!ELEMENT unit EMPTY>
- <!ATTLIST unit
- mrp CDATA #IMPLIED
- filter CDATA #IMPLIED
- bldFile CDATA #IMPLIED
- root CDATA #IMPLIED
- version NMTOKEN #IMPLIED
- prebuilt NMTOKEN #IMPLIED
- late (Y|N) #IMPLIED
- priority CDATA #IMPLIED>
- <!ELEMENT SystemBuild (option*|target+|targetList+|list+|configuration+)*>
- <!ATTLIST SystemBuild schema CDATA #REQUIRED>
- <!ELEMENT list (ref+)>
- <!ATTLIST list
- name ID #REQUIRED
- description CDATA #REQUIRED>
- <!ELEMENT ref EMPTY>
- <!ATTLIST ref item CDATA #REQUIRED>
- <!ELEMENT targetList EMPTY>
- <!ATTLIST targetList
- name ID #REQUIRED
- description CDATA #REQUIRED
- target IDREFS #REQUIRED>
- <!ELEMENT target EMPTY>
- <!ATTLIST target
- name ID #REQUIRED
- abldTarget CDATA #REQUIRED
- description CDATA #REQUIRED>
- <!ELEMENT option EMPTY>
- <!ATTLIST option
- name ID #REQUIRED
- abldOption CDATA #REQUIRED
- description CDATA #REQUIRED
- enable (Y|N) #REQUIRED>
- <!ELEMENT configuration (listRef+|ref+|task+)*>
- <!ATTLIST configuration
- name ID #REQUIRED
- description CDATA #REQUIRED
- filter CDATA #REQUIRED>
- <!ELEMENT task (listRef*,(buildLayer|specialInstructions))>
- <!ELEMENT listRef EMPTY>
- <!ATTLIST listRef list CDATA #REQUIRED>
- <!ELEMENT buildLayer EMPTY>
- <!ATTLIST buildLayer
- command CDATA #REQUIRED
- targetList IDREFS #IMPLIED
- unitParallel (Y|N) #REQUIRED
- targetParallel (Y|N) 'N'>
- <!ELEMENT specialInstructions EMPTY>
- <!ATTLIST specialInstructions
- name CDATA #REQUIRED
- cwd CDATA #REQUIRED
- root CDATA #IMPLIED
- command CDATA #REQUIRED>
-]>
-<SystemDefinition schema="2.0.1" name="Symbian^3">
-<systemModel>
-<layer name="os" long-name="OS" levels="hw services">
-<block name="buildtools" level="hw" long-name="Build Tools" levels="bld mw fw ui">
-<collection name="bldsystemtools" long-name="Build System Tools" level="bld">
-<component name="buildsystemtools" long-name="Build System Tools" purpose="development">
-<unit bldFile="/sf/os/buildtools/bldsystemtools/buildsystemtools/group" mrp="/sf/os/buildtools/bldsystemtools/buildsystemtools/group/tools_build.mrp"/>
-</component>
-<component name="gttechviewbaseline" long-name="GT Techview Baseline" purpose="development">
-<unit mrp="/sf/os/buildtools/packaging/additionalutils/gt_techview_baseline.mrp"/>
-</component>
-<component name="commonbldutils" long-name="Common Utils" purpose="development">
-<unit mrp="/sf/os/buildtools/bldsystemtools/commonbldutils/tools_utils_common.mrp"/>
-</component>
-</collection>
-<collection name="packaging" long-name="Packaging" level="ui">
-<component name="additionalutils" long-name="Additional Utils" purpose="development">
-<unit mrp="/sf/os/buildtools/packaging/additionalutils/additional_unknown_cedar.mrp"/>
-</component>
-<component name="dummy" long-name="Dummy" purpose="development">
-<unit bldFile="/sf/os/buildtools/packaging/dummy" mrp="/sf/os/buildtools/packaging/dummy/additional_dummy.mrp"/>
-</component>
-</collection>
-<collection name="toolsandutils" long-name="Tools and Utils" level="mw">
-<component name="productionbldtools" long-name="Production Build Tools" filter="gt" purpose="development">
-<unit mrp="/sf/os/buildtools/toolsandutils/productionbldtools/product_tools.mrp"/>
-</component>
-<component name="e32tools" long-name="E32 Tools" deprecated="tb91" purpose="development" class="PC">
-<unit bldFile="/sf/os/buildtools/toolsandutils/e32tools/group" mrp="/sf/os/buildtools/toolsandutils/e32tools/group/tools_e32tools.mrp"/>
-</component>
-<component name="wincredistribution" long-name="WinC Redistribution" purpose="development">
-<unit mrp="/sf/os/buildtools/dist_os/redistributionwinceka2/tools_redistribution_winc.mrp"/>
-</component>
-<component name="additionalredistribution" long-name="Additional Redistribution" purpose="development">
-<unit mrp="/sf/os/buildtools/perltoolsplat_os/redistribution/additional_tools.mrp"/>
-</component>
-<component name="statapi" long-name="STAT API" filter="gt" purpose="development">
-<unit bldFile="/sf/os/buildtools/toolsandutils/statapi/source/statapi/console" mrp="/sf/os/buildtools/toolsandutils/statapi/group/testtools_stat_device_gt.mrp"/>
-</component>
-<component name="wintunnel" long-name="Wintunnel" purpose="development">
-<unit mrp="/sf/os/buildtools/toolsandutils/wintunnel/group/testtools_WinTunnel_srconly.mrp"/>
-</component>
-<component name="autotest" long-name="Autotest" purpose="development">
-<unit bldFile="/sf/os/buildtools/toolsandutils/autotest/group" mrp="/sf/os/buildtools/toolsandutils/autotest/group/tools_autotest.mrp"/>
-</component>
-</collection>
-<collection name="sbsv1_os" long-name="Symbian Build System v1" level="fw">
-<component name="e32toolp" long-name="E32 Perl Tools" purpose="development" class="PC">
-<unit bldFile="/sf/os/buildtools/sbsv1_os/e32toolp/group" mrp="/sf/os/buildtools/sbsv1_os/e32toolp/group/tools_e32toolp.mrp"/>
-</component>
-</collection>
-<collection name="imgtools_os" long-name="Image Tools" level="fw">
-<component name="romkiteka2" long-name="ROMKIT EKA2" deprecated="tb91" purpose="development">
-<unit bldFile="/sf/os/buildtools/imgtools_os/romkiteka2/group" mrp="/sf/os/buildtools/imgtools_os/romkiteka2/group/tools_romkit.mrp"/>
-</component>
-</collection>
-<collection name="misccomponents" long-name="Misc Components" level="mw">
-<component name="emulatorlauncher" long-name="Emulator Launcher" filter="gt" purpose="development">
-<unit bldFile="/sf/os/buildtools/misccomponents/emulatorlauncher/group" mrp="/sf/os/buildtools/misccomponents/emulatorlauncher/group/tools_sdk_eng_emulator_launcher.mrp"/>
-</component>
-</collection>
-<collection name="buildtools_info" long-name="Build Tools Info" level="ui">
-<component name="buildtools_metadata" long-name="Build Tools Metadata" introduced="tb91" purpose="development" class="config PC">
-<unit mrp="/sf/os/buildtools/buildtools_info/buildtools_metadata/buildtools_metadata.mrp"/>
-</component>
-</collection>
-</block>
-</layer>
-</systemModel>
-</SystemDefinition>
\ No newline at end of file
+<!DOCTYPE SystemDefinition [
+<!ELEMENT SystemDefinition ( systemModel )>
+<!ATTLIST SystemDefinition
+ name CDATA #REQUIRED
+ schema CDATA #REQUIRED
+>
+<!-- all paths are relative to the environment variable specified by the root attribute, or SOURCEROOT if not. -->
+
+<!-- System Model Section of DTD -->
+<!ELEMENT systemModel (layer+)>
+
+<!ELEMENT layer (block* | collection*)*>
+<!-- Kernel Services, Base Services, OS Services, Etc -->
+<!ATTLIST layer
+ name CDATA #REQUIRED
+ long-name CDATA #IMPLIED
+ levels NMTOKENS #IMPLIED
+ span CDATA #IMPLIED
+>
+
+<!ELEMENT block (subblock* | collection*)*>
+ <!-- Generic OS services, Comms Services, etc -->
+<!ATTLIST block
+ levels NMTOKENS #IMPLIED
+ span CDATA #IMPLIED
+ level NMTOKEN #IMPLIED
+ name CDATA #REQUIRED
+ long-name CDATA #IMPLIED
+>
+
+<!ELEMENT subblock (collection)*>
+<!-- Cellular Baseband Services, Networking Services, etc -->
+<!ATTLIST subblock
+ name CDATA #REQUIRED
+ long-name CDATA #IMPLIED
+>
+
+<!ELEMENT collection (component)*>
+<!-- Screen Driver, Content Handling, etc -->
+<!ATTLIST collection
+ name CDATA #REQUIRED
+ long-name CDATA #IMPLIED
+ level NMTOKEN #IMPLIED
+>
+
+<!ELEMENT component (unit)*>
+<!-- contains units or is a package or prebuilt -->
+<!ATTLIST component
+ name CDATA #REQUIRED
+ long-name CDATA #IMPLIED
+ deprecated CDATA #IMPLIED
+ introduced CDATA #IMPLIED
+ contract CDATA #IMPLIED
+ plugin (Y|N) "N"
+ filter CDATA #IMPLIED
+ class NMTOKENS #IMPLIED
+ supports CDATA #IMPLIED
+ purpose ( optional | mandatory | development ) "optional"
+>
+
+<!ELEMENT unit EMPTY >
+<!-- must be buildable (bld.inf) -->
+<!-- bldFile may someday be removed in favour of mrp -->
+<!ATTLIST unit
+ mrp CDATA #IMPLIED
+ filter CDATA #IMPLIED
+ bldFile CDATA #IMPLIED
+ root CDATA #IMPLIED
+ version NMTOKEN #IMPLIED
+ prebuilt NMTOKEN #IMPLIED
+ late (Y|N) #IMPLIED
+ priority CDATA #IMPLIED
+>
+]>
+<SystemDefinition name="Symbian^3" schema="2.0.1">
+ <systemModel>
+ <layer name="os" long-name="OS" levels="hw services">
+ <block name="buildtools" level="hw" long-name="Build Tools" levels="bld mw fw ui">
+ <collection name="bldsystemtools" long-name="Build System Tools" level="bld">
+ <component name="sysdeftools" long-name="System Definition Tools" purpose="development" introduced="^2">
+ <unit mrp="/sf/os/buildtools/bldsystemtools/sysdeftools/group/sysdeftools.mrp"/>
+ </component>
+ <component name="gttechviewbaseline" long-name="GT Techview Baseline" purpose="development">
+ <unit mrp="/sf/os/buildtools/packaging/additionalutils/gt_techview_baseline.mrp"/>
+ </component>
+ <component name="commonbldutils" long-name="Common Utils" purpose="development">
+ <unit mrp="/sf/os/buildtools/bldsystemtools/commonbldutils/tools_utils_common.mrp"/>
+ </component>
+ </collection>
+ <collection name="packaging" long-name="Packaging" level="ui">
+ <component name="additionalutils" long-name="Additional Utils" purpose="development">
+ <unit mrp="/sf/os/buildtools/packaging/additionalutils/additional_unknown_cedar.mrp"/>
+ </component>
+ <component name="dummy" long-name="Dummy" purpose="development">
+ <unit bldFile="/sf/os/buildtools/packaging/dummy" mrp="/sf/os/buildtools/packaging/dummy/additional_dummy.mrp"/>
+ </component>
+ </collection>
+ <collection name="toolsandutils" long-name="Tools and Utils" level="mw">
+ <component name="productionbldtools" long-name="Production Build Tools" filter="gt" purpose="development">
+ <unit mrp="/sf/os/buildtools/toolsandutils/productionbldtools/product_tools.mrp"/>
+ </component>
+ <component name="e32tools" long-name="E32 Tools" deprecated="^2" purpose="development" class="PC">
+ <unit bldFile="/sf/os/buildtools/toolsandutils/e32tools/group" mrp="/sf/os/buildtools/toolsandutils/e32tools/group/tools_e32tools.mrp"/>
+ </component>
+ <component name="wincredistribution" long-name="WinC Redistribution" purpose="development" filter="test">
+ <unit mrp="/sf/os/buildtools/dist_os/redistributionwinceka2/tools_redistribution_winc.mrp" bldFile="/sf/os/buildtools/dist_os/redistributionwinceka2"/>
+ </component>
+ <component name="additionalredistribution" long-name="Additional Redistribution" purpose="development" filter="test">
+ <unit mrp="/sf/os/buildtools/perltoolsplat_os/redistribution/additional_tools.mrp" bldFile="/sf/os/buildtools/perltoolsplat_os/redistribution"/>
+ </component>
+ <component name="statapi" long-name="STAT API" filter="gt" purpose="development">
+ <unit bldFile="/sf/os/buildtools/toolsandutils/statapi/source/statapi/console" mrp="/sf/os/buildtools/toolsandutils/statapi/group/testtools_stat_device_gt.mrp"/>
+ </component>
+ <component name="wintunnel" long-name="Wintunnel" purpose="development" filter="test">
+ <unit mrp="/sf/os/buildtools/toolsandutils/wintunnel/group/testtools_WinTunnel_srconly.mrp" bldFile="/sf/os/buildtools/toolsandutils/wintunnel/group"/>
+ </component>
+ <component name="autotest" long-name="Autotest" purpose="development">
+ <unit bldFile="/sf/os/buildtools/toolsandutils/autotest/group" mrp="/sf/os/buildtools/toolsandutils/autotest/group/tools_autotest.mrp"/>
+ </component>
+ </collection>
+ <collection name="sbsv1_os" long-name="Symbian Build System v1" level="fw">
+ <component name="e32toolp" long-name="E32 Perl Tools" purpose="development" filter="test" class="PC">
+ <unit mrp="/sf/os/buildtools/sbsv1_os/e32toolp/group/tools_e32toolp.mrp" bldFile="/sf/os/buildtools/sbsv1_os/e32toolp/group"/>
+ </component>
+ </collection>
+ <collection name="imgtools_os" long-name="Image Tools" level="fw">
+ <component name="romkiteka2" long-name="ROMKIT EKA2" deprecated="^2" purpose="development">
+ <unit bldFile="/sf/os/buildtools/imgtools_os/romkiteka2/group" mrp="/sf/os/buildtools/imgtools_os/romkiteka2/group/tools_romkit.mrp"/>
+ </component>
+ </collection>
+ <collection name="misccomponents" long-name="Misc Components" level="mw">
+ <component name="emulatorlauncher" long-name="Emulator Launcher" filter="gt" purpose="development">
+ <unit bldFile="/sf/os/buildtools/misccomponents/emulatorlauncher/group" mrp="/sf/os/buildtools/misccomponents/emulatorlauncher/group/tools_sdk_eng_emulator_launcher.mrp"/>
+ </component>
+ </collection>
+ <collection name="buildtools_info" long-name="Build Tools Info" level="ui">
+ <component name="buildtools_metadata" long-name="Build Tools Metadata" introduced="^2" purpose="development" class="config PC">
+ <unit mrp="/sf/os/buildtools/buildtools_info/buildtools_metadata/buildtools_metadata.mrp"/>
+ </component>
+ </collection>
+ </block>
+ </layer>
+ </systemModel>
+</SystemDefinition>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/symbian3/os/buildtools/package_definition_3.0.xml Mon Feb 15 18:25:55 2010 +0000
@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<SystemDefinition schema="3.0.0">
+ <package id="buildtools" name="Build Tools" levels="bld mw fw ui">
+ <collection id="bldsystemtools" name="Build System Tools" level="bld">
+ <component id="sysdeftools" name="System Definition Tools" purpose="development" introduced="^2">
+ <unit mrp="bldsystemtools/sysdeftools/group/sysdeftools.mrp"/>
+ </component>
+ <component id="gttechviewbaseline" name="GT Techview Baseline" purpose="development">
+ <unit mrp="packaging/additionalutils/gt_techview_baseline.mrp"/>
+ </component>
+ <component id="commonbldutils" name="Common Utils" purpose="development">
+ <unit mrp="bldsystemtools/commonbldutils/tools_utils_common.mrp"/>
+ </component>
+ </collection>
+ <collection id="packaging" name="Packaging" level="ui">
+ <component id="additionalutils" name="Additional Utils" purpose="development">
+ <unit mrp="packaging/additionalutils/additional_unknown_cedar.mrp"/>
+ </component>
+ <component id="dummy" name="Dummy" purpose="development">
+ <unit bldFile="packaging/dummy" mrp="packaging/dummy/additional_dummy.mrp"/>
+ </component>
+ </collection>
+ <collection id="toolsandutils" name="Tools and Utils" level="mw">
+ <component id="productionbldtools" name="Production Build Tools" filter="gt" purpose="development">
+ <unit mrp="toolsandutils/productionbldtools/product_tools.mrp"/>
+ </component>
+ <component id="e32tools" name="E32 Tools" deprecated="^2" purpose="development" target="desktop">
+ <unit bldFile="toolsandutils/e32tools/group" mrp="toolsandutils/e32tools/group/tools_e32tools.mrp"/>
+ </component>
+ <component id="wincredistribution" name="WinC Redistribution" purpose="development" filter="test">
+ <unit mrp="dist_os/redistributionwinceka2/tools_redistribution_winc.mrp" bldFile="dist_os/redistributionwinceka2"/>
+ </component>
+ <component id="additionalredistribution" name="Additional Redistribution" purpose="development" filter="test">
+ <unit mrp="perltoolsplat_os/redistribution/additional_tools.mrp" bldFile="perltoolsplat_os/redistribution"/>
+ </component>
+ <component id="statapi" name="STAT API" filter="gt" purpose="development">
+ <unit bldFile="toolsandutils/statapi/source/statapi/console" mrp="toolsandutils/statapi/group/testtools_stat_device_gt.mrp"/>
+ </component>
+ <component id="wintunnel" name="Wintunnel" purpose="development" filter="test">
+ <unit mrp="toolsandutils/wintunnel/group/testtools_WinTunnel_srconly.mrp" bldFile="toolsandutils/wintunnel/group"/>
+ </component>
+ <component id="autotest" name="Autotest" purpose="development">
+ <unit bldFile="toolsandutils/autotest/group" mrp="toolsandutils/autotest/group/tools_autotest.mrp"/>
+ </component>
+ </collection>
+ <collection id="sbsv1_os" name="Symbian Build System v1" level="fw">
+ <component id="e32toolp" name="E32 Perl Tools" purpose="development" target="desktop" filter="test">
+ <unit mrp="sbsv1_os/e32toolp/group/tools_e32toolp.mrp" bldFile="sbsv1_os/e32toolp/group"/>
+ </component>
+ </collection>
+ <collection id="imgtools_os" name="Image Tools" level="fw">
+ <component id="romkiteka2" name="ROMKIT EKA2" deprecated="^2" purpose="development">
+ <unit bldFile="imgtools_os/romkiteka2/group" mrp="imgtools_os/romkiteka2/group/tools_romkit.mrp"/>
+ </component>
+ </collection>
+ <collection id="misccomponents" name="Misc Components" level="mw">
+ <component id="emulatorlauncher" name="Emulator Launcher" filter="gt" purpose="development">
+ <unit bldFile="misccomponents/emulatorlauncher/group" mrp="misccomponents/emulatorlauncher/group/tools_sdk_eng_emulator_launcher.mrp"/>
+ </component>
+ </collection>
+ <collection id="buildtools_info" name="Build Tools Info" level="ui">
+ <component id="buildtools_metadata" name="Build Tools Metadata" class="config" introduced="^2" purpose="development" target="desktop">
+ <unit mrp="buildtools_info/buildtools_metadata/buildtools_metadata.mrp"/>
+ </component>
+ </collection>
+ </package>
+</SystemDefinition>
--- a/symbian3/os/cellularsrv/package_definition.xml Fri Feb 12 16:37:22 2010 +0000
+++ b/symbian3/os/cellularsrv/package_definition.xml Mon Feb 15 18:25:55 2010 +0000
@@ -1,239 +1,221 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE SystemDefinition [
- <!ELEMENT SystemDefinition (systemModel?,SystemBuild?)>
- <!ATTLIST SystemDefinition
- name CDATA #REQUIRED
- schema CDATA #REQUIRED>
- <!ELEMENT systemModel (layer+)>
- <!ELEMENT layer (block*|collection*)*>
- <!ATTLIST layer
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED
- levels NMTOKENS #IMPLIED
- span CDATA #IMPLIED>
- <!ELEMENT block (subblock*|collection*)*>
- <!ATTLIST block
- levels NMTOKENS #IMPLIED
- span CDATA #IMPLIED
- level NMTOKEN #IMPLIED
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED>
- <!ELEMENT subblock (collection)*>
- <!ATTLIST subblock
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED>
- <!ELEMENT collection (component)*>
- <!ATTLIST collection
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED
- level NMTOKEN #IMPLIED>
- <!ELEMENT component (unit)*>
- <!ATTLIST component
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED
- deprecated CDATA #IMPLIED
- introduced CDATA #IMPLIED
- contract CDATA #IMPLIED
- plugin (Y|N) 'N'
- filter CDATA #IMPLIED
- class NMTOKENS #IMPLIED
- supports CDATA #IMPLIED
- purpose (optional|mandatory|development) 'optional'>
- <!ELEMENT unit EMPTY>
- <!ATTLIST unit
- mrp CDATA #IMPLIED
- filter CDATA #IMPLIED
- bldFile CDATA #IMPLIED
- root CDATA #IMPLIED
- version NMTOKEN #IMPLIED
- prebuilt NMTOKEN #IMPLIED
- late (Y|N) #IMPLIED
- priority CDATA #IMPLIED>
- <!ELEMENT SystemBuild (option*|target+|targetList+|list+|configuration+)*>
- <!ATTLIST SystemBuild schema CDATA #REQUIRED>
- <!ELEMENT list (ref+)>
- <!ATTLIST list
- name ID #REQUIRED
- description CDATA #REQUIRED>
- <!ELEMENT ref EMPTY>
- <!ATTLIST ref item CDATA #REQUIRED>
- <!ELEMENT targetList EMPTY>
- <!ATTLIST targetList
- name ID #REQUIRED
- description CDATA #REQUIRED
- target IDREFS #REQUIRED>
- <!ELEMENT target EMPTY>
- <!ATTLIST target
- name ID #REQUIRED
- abldTarget CDATA #REQUIRED
- description CDATA #REQUIRED>
- <!ELEMENT option EMPTY>
- <!ATTLIST option
- name ID #REQUIRED
- abldOption CDATA #REQUIRED
- description CDATA #REQUIRED
- enable (Y|N) #REQUIRED>
- <!ELEMENT configuration (listRef+|ref+|task+)*>
- <!ATTLIST configuration
- name ID #REQUIRED
- description CDATA #REQUIRED
- filter CDATA #REQUIRED>
- <!ELEMENT task (listRef*,(buildLayer|specialInstructions))>
- <!ELEMENT listRef EMPTY>
- <!ATTLIST listRef list CDATA #REQUIRED>
- <!ELEMENT buildLayer EMPTY>
- <!ATTLIST buildLayer
- command CDATA #REQUIRED
- targetList IDREFS #IMPLIED
- unitParallel (Y|N) #REQUIRED
- targetParallel (Y|N) 'N'>
- <!ELEMENT specialInstructions EMPTY>
- <!ATTLIST specialInstructions
- name CDATA #REQUIRED
- cwd CDATA #REQUIRED
- root CDATA #IMPLIED
- command CDATA #REQUIRED>
-]>
-<SystemDefinition schema="2.0.1" name="Symbian^3">
-<systemModel>
-<layer name="os" long-name="OS" levels="hw services">
-<block name="cellularsrv" level="services" long-name="Cellular Baseband Services" levels="adaptation hw-if plugin framework server app-if">
-<collection name="basebandabstraction" long-name="Baseband Abstraction" level="hw-if">
-<component name="basebandchanneladaptor" long-name="Baseband Channel Adaptor" introduced="8.1" purpose="optional">
-<unit bldFile="/sf/os/cellularsrv/basebandabstraction/basebandchanneladaptor/group" mrp="/sf/os/cellularsrv/basebandabstraction/basebandchanneladaptor/group/networking_bca.mrp"/>
-</component>
-</collection>
-<collection name="basebandadaptationplugins" long-name="Baseband Adaptation Plugins" level="adaptation">
-<component name="basebandchanneladaptorforc32" long-name="Baseband Channel Adaptor for C32" introduced="8.1" purpose="optional" plugin="Y">
-<unit bldFile="/sf/os/cellularsrv/basebandadaptationplugins/basebandchanneladaptorforc32/group" mrp="/sf/os/cellularsrv/basebandadaptationplugins/basebandchanneladaptorforc32/group/networking_c32bca.mrp"/>
-</component>
-</collection>
-<collection name="fax" long-name="Fax" level="server">
-<component name="faxclientandserver" long-name="Fax Client and Server" purpose="optional">
-<unit bldFile="/sf/os/cellularsrv/fax/faxclientandserver/Group" mrp="/sf/os/cellularsrv/fax/faxclientandserver/Group/telephony_fax.mrp"/>
-</component>
-</collection>
-<collection name="smsprotocols" long-name="SMS Protocols" level="framework">
-<component name="smsstack" long-name="SMS Stack" introduced="6.0" purpose="mandatory" plugin="Y">
-<unit bldFile="/sf/os/cellularsrv/smsprotocols/smsstack/group" mrp="/sf/os/cellularsrv/smsprotocols/smsstack/group/nbprotocols_smsstackv2.mrp"/>
-</component>
-</collection>
-<collection name="telephonyprotocols" long-name="Telephony Protocols" level="framework">
-<component name="csdagt" long-name="CSD AGT" introduced="6.1" purpose="optional" plugin="Y">
-<unit bldFile="/sf/os/cellularsrv/telephonyprotocols/csdagt/group" mrp="/sf/os/cellularsrv/telephonyprotocols/csdagt/group/networking_csdagt.mrp"/>
-</component>
-<component name="psdagt" long-name="PSD AGT" introduced="7.0s" purpose="optional" plugin="Y">
-<unit bldFile="/sf/os/cellularsrv/telephonyprotocols/psdagt/group" mrp="/sf/os/cellularsrv/telephonyprotocols/psdagt/group/networking_psdagt.mrp"/>
-</component>
-<component name="gprsumtsqosprt" long-name="GPRS/UMTS QoS PRT" introduced="7.0s" purpose="optional" plugin="Y">
-<unit bldFile="/sf/os/cellularsrv/telephonyprotocols/gprsumtsqosprt/group" mrp="/sf/os/cellularsrv/telephonyprotocols/gprsumtsqosprt/group/networking_guqos.mrp"/>
-</component>
-<component name="gprsumtsqosinterface" long-name="GPRS/UMTS QoS Interface" introduced="7.0s" purpose="optional" plugin="Y">
-<unit bldFile="/sf/os/cellularsrv/telephonyprotocols/gprsumtsqosinterface/group" mrp="/sf/os/cellularsrv/telephonyprotocols/gprsumtsqosinterface/group/networking_umtsif.mrp"/>
-</component>
-<component name="qosextnapi" long-name="QoS Extn API" introduced="9.2" purpose="optional">
-<unit bldFile="/sf/os/cellularsrv/telephonyprotocols/qosextnapi/group" mrp="/sf/os/cellularsrv/telephonyprotocols/qosextnapi/group/networking_qosextnapi.mrp"/>
-</component>
-<component name="secondarypdpcontextumtsdriver" long-name="Secondary PDP context UMTS Driver" introduced="8.1" purpose="optional">
-<unit bldFile="/sf/os/cellularsrv/telephonyprotocols/secondarypdpcontextumtsdriver/group" mrp="/sf/os/cellularsrv/telephonyprotocols/secondarypdpcontextumtsdriver/group/networking_spud.mrp"/>
-</component>
-<component name="qos3gppcpr" long-name="QoS 3GPP CPR" introduced="9.2" purpose="optional" plugin="Y">
-<unit bldFile="/sf/os/cellularsrv/telephonyprotocols/qos3gppcpr/group" mrp="/sf/os/cellularsrv/telephonyprotocols/qos3gppcpr/group/networking_Qos3GPP.mrp"/>
-</component>
-<component name="pdplayer" long-name="PDP Layer" introduced="tb92" purpose="optional" plugin="Y">
-<unit bldFile="/sf/os/cellularsrv/telephonyprotocols/pdplayer/group" mrp="/sf/os/cellularsrv/telephonyprotocols/pdplayer/group/networking_pdp.mrp"/>
-</component>
-<component name="rawipnif" long-name="Raw IP NIF" introduced="8.1" purpose="optional" plugin="Y">
-<unit bldFile="/sf/os/cellularsrv/telephonyprotocols/rawipnif/group" mrp="/sf/os/cellularsrv/telephonyprotocols/rawipnif/group/networking_rawipnif.mrp"/>
-</component>
-</collection>
-<collection name="telephonyserver" long-name="Telephony Server" level="server">
-<component name="etelserverandcore" long-name="ETel Server and Core" purpose="mandatory">
-<unit bldFile="/sf/os/cellularsrv/telephonyserver/etelserverandcore/group" mrp="/sf/os/cellularsrv/telephonyserver/etelserverandcore/group/telephony_etel.mrp"/>
-</component>
-<component name="etelconfig" long-name="ETel Config" purpose="mandatory" class="config">
-<unit mrp="/sf/os/cellularsrv/telephonyserver/etelserverandcore/group/telephony_etel-config.mrp"/>
-</component>
-<component name="etelmultimode" long-name="ETel Multimode" introduced="7.0" purpose="mandatory">
-<unit bldFile="/sf/os/cellularsrv/telephonyserver/etelmultimode/group" mrp="/sf/os/cellularsrv/telephonyserver/etelmultimode/group/telephony_etelmm.mrp"/>
-</component>
-<component name="etelpacketdata" long-name="ETel Packet Data" introduced="7.0" purpose="mandatory">
-<unit bldFile="/sf/os/cellularsrv/telephonyserver/etelpacketdata/group" mrp="/sf/os/cellularsrv/telephonyserver/etelpacketdata/group/telephony_etelpckt.mrp"/>
-</component>
-<component name="etelsimtoolkit" long-name="ETel SIM Toolkit" introduced="6.1" purpose="mandatory">
-<unit bldFile="/sf/os/cellularsrv/telephonyserver/etelsimtoolkit/group" mrp="/sf/os/cellularsrv/telephonyserver/etelsimtoolkit/group/telephony_etelsat.mrp"/>
-</component>
-</collection>
-<collection name="telephonyserverplugins" long-name="Telephony Server Plugins" level="plugin">
-<component name="common_tsy" long-name="Common TSY" introduced="tb91" purpose="optional" plugin="Y">
-<unit bldFile="/sf/os/cellularsrv/telephonyserverplugins/common_tsy/group" mrp="/sf/os/cellularsrv/telephonyserverplugins/common_tsy/group/telephony_commontsy.mrp"/>
-</component>
-<component name="licenseetsystub" long-name="Licensee TSY Stub" introduced="tb91" purpose="development" plugin="Y">
-<unit mrp="/sf/os/cellularsrv/telephonyserverplugins/licenseetsystub/group/licenseetsystub.mrp"/>
-</component>
-<component name="multimodetsy" long-name="Multimode TSY" purpose="development" plugin="Y">
-<unit bldFile="/sf/os/cellularsrv/telephonyserverplugins/multimodetsy/group" mrp="/sf/os/cellularsrv/telephonyserverplugins/multimodetsy/group/telephony_mmtsy.mrp"/>
-</component>
-<component name="simtsy" long-name="SIM TSY" introduced="7.0" purpose="development" plugin="Y">
-<unit bldFile="/sf/os/cellularsrv/telephonyserverplugins/simtsy/group" mrp="/sf/os/cellularsrv/telephonyserverplugins/simtsy/group/telephony_simtsy.mrp"/>
-</component>
-<component name="ctsydispatchlayer" long-name="C-TSY Dispatch Layer" introduced="tb92" purpose="optional" plugin="Y">
-<unit bldFile="/sf/os/cellularsrv/telephonyserverplugins/ctsydispatchlayer/group" mrp="/sf/os/cellularsrv/telephonyserverplugins/ctsydispatchlayer/group/telephony_dispatcher.mrp"/>
-</component>
-<component name="simatktsy" long-name="SIMATK TSY" introduced="tb92" purpose="optional" plugin="Y">
-<unit bldFile="/sf/os/cellularsrv/telephonyserverplugins/simatktsy/group" mrp="/sf/os/cellularsrv/telephonyserverplugins/simatktsy/group/commonsimatktsy.mrp"/>
-</component>
-</collection>
-<collection name="telephonyutils" long-name="Telephony Utilities" level="app-if">
-<component name="dial" long-name="Dial" deprecated="9.1" purpose="optional">
-<unit bldFile="/sf/os/cellularsrv/telephonyutils/dial/group" mrp="/sf/os/cellularsrv/telephonyutils/dial/group/telephony_dial.mrp"/>
-</component>
-<component name="telephonywatchers" long-name="Telephony Watchers" introduced="6.0" purpose="optional" plugin="Y">
-<unit bldFile="/sf/os/cellularsrv/telephonyutils/telephonywatchers/group" mrp="/sf/os/cellularsrv/telephonyutils/telephonywatchers/group/telephony_watchers.mrp"/>
-</component>
-<component name="etel3rdpartyapi" long-name="ETel 3rd Party API" introduced="7.0" purpose="mandatory">
-<unit bldFile="/sf/os/cellularsrv/telephonyutils/etel3rdpartyapi/Group" mrp="/sf/os/cellularsrv/telephonyutils/etel3rdpartyapi/Group/telephony_etel3rdparty.mrp"/>
-</component>
-</collection>
-<collection name="cellularsrv_info" long-name="Cellular Baseband Services Info" level="app-if">
-<component name="telephonyconfidentialdocs" long-name="Telephony Confidential Documentation" purpose="development" class="doc">
-<unit mrp="/sf/os/cellularsrv/cellularsrv_info/telephonyconfidentialdocs/telephony_confidential.mrp"/>
-</component>
-<component name="telephonydocs" long-name="Telephony Documentation" purpose="development" class="doc">
-<unit mrp="/sf/os/cellularsrv/cellularsrv_info/telephonydocs/telephony_documentation.mrp"/>
-</component>
-<component name="cellularsrv_metadata" long-name="Cellular Baseband Services Metadata" introduced="tb91" purpose="development" class="config PC">
-<unit mrp="/sf/os/cellularsrv/cellularsrv_info/cellularsrv_metadata/cellularsrv_metadata.mrp"/>
-</component>
-</collection>
-<collection name="hwpluginsimulation" long-name="Hardware Plugin Simulation" level="adaptation">
-<component name="mocksy" long-name="MockSY" introduced="tb91" purpose="development" plugin="Y">
-<unit bldFile="/sf/os/cellularsrv/hwpluginsimulation/mocksy/group" mrp="/sf/os/cellularsrv/hwpluginsimulation/mocksy/group/telephony_tools_mocksy.mrp"/>
-</component>
-</collection>
-<collection name="cellularsrvapitest" long-name="Telephony API Tests" level="app-if">
-<component name="datatransferhaitest" long-name="Data Transfer HAI Tests" introduced="tb91" purpose="development">
-<unit mrp="/sf/os/cellularsrv/cellularsrvapitest/datatransferhaitest/group/datatransferhaitest.mrp"/>
-</component>
-<component name="telephonyhaitest" long-name="Telephony HAI Tests" introduced="tb91" purpose="development">
-<unit mrp="/sf/os/cellularsrv/cellularsrvapitest/telephonyhaitest/group/telephonyhaitest.mrp"/>
-</component>
-<component name="telephonydevsoundhaitest" long-name="DevSound Telephony HAI Tests" introduced="tb91" purpose="development">
-<unit mrp="/sf/os/cellularsrv/cellularsrvapitest/telephonydevsoundhaitest/group/telephonydevsoundhaitest.mrp"/>
-</component>
-</collection>
-<collection name="s60">
-<component name="cellularsrv">
-<unit bldFile="/sf/os/cellularsrv/group" mrp=""/>
-</component>
-<component name="sf_common_tsy">
-<unit bldFile="/sf/os/cellularsrv/telephonyserverplugins/common_tsy/group" mrp=""/>
-</component>
-<component name="sf_licenseetsystub">
-<unit bldFile="/sf/os/cellularsrv/telephonyserverplugins/licenseetsystub/group" mrp=""/>
-</component>
-</collection>
-</block>
-</layer>
-</systemModel>
-</SystemDefinition>
\ No newline at end of file
+<!DOCTYPE SystemDefinition [
+<!ELEMENT SystemDefinition ( systemModel )>
+<!ATTLIST SystemDefinition
+ name CDATA #REQUIRED
+ schema CDATA #REQUIRED
+>
+<!-- all paths are relative to the environment variable specified by the root attribute, or SOURCEROOT if not. -->
+
+<!-- System Model Section of DTD -->
+<!ELEMENT systemModel (layer+)>
+
+<!ELEMENT layer (block* | collection*)*>
+<!-- Kernel Services, Base Services, OS Services, Etc -->
+<!ATTLIST layer
+ name CDATA #REQUIRED
+ long-name CDATA #IMPLIED
+ levels NMTOKENS #IMPLIED
+ span CDATA #IMPLIED
+>
+
+<!ELEMENT block (subblock* | collection*)*>
+ <!-- Generic OS services, Comms Services, etc -->
+<!ATTLIST block
+ levels NMTOKENS #IMPLIED
+ span CDATA #IMPLIED
+ level NMTOKEN #IMPLIED
+ name CDATA #REQUIRED
+ long-name CDATA #IMPLIED
+>
+
+<!ELEMENT subblock (collection)*>
+<!-- Cellular Baseband Services, Networking Services, etc -->
+<!ATTLIST subblock
+ name CDATA #REQUIRED
+ long-name CDATA #IMPLIED
+>
+
+<!ELEMENT collection (component)*>
+<!-- Screen Driver, Content Handling, etc -->
+<!ATTLIST collection
+ name CDATA #REQUIRED
+ long-name CDATA #IMPLIED
+ level NMTOKEN #IMPLIED
+>
+
+<!ELEMENT component (unit)*>
+<!-- contains units or is a package or prebuilt -->
+<!ATTLIST component
+ name CDATA #REQUIRED
+ long-name CDATA #IMPLIED
+ deprecated CDATA #IMPLIED
+ introduced CDATA #IMPLIED
+ contract CDATA #IMPLIED
+ plugin (Y|N) "N"
+ filter CDATA #IMPLIED
+ class NMTOKENS #IMPLIED
+ supports CDATA #IMPLIED
+ purpose ( optional | mandatory | development ) "optional"
+>
+
+<!ELEMENT unit EMPTY >
+<!-- must be buildable (bld.inf) -->
+<!-- bldFile may someday be removed in favour of mrp -->
+<!ATTLIST unit
+ mrp CDATA #IMPLIED
+ filter CDATA #IMPLIED
+ bldFile CDATA #IMPLIED
+ root CDATA #IMPLIED
+ version NMTOKEN #IMPLIED
+ prebuilt NMTOKEN #IMPLIED
+ late (Y|N) #IMPLIED
+ priority CDATA #IMPLIED
+>
+]>
+<SystemDefinition name="Symbian^3" schema="2.0.1">
+ <systemModel>
+ <layer name="os" long-name="OS" levels="hw services">
+ <block name="cellularsrv" level="services" long-name="Cellular Baseband Services" levels="adaptation hw-if plugin framework server app-if">
+ <collection name="basebandabstraction" long-name="Baseband Abstraction" level="hw-if">
+ <component name="basebandchanneladaptor" long-name="Baseband Channel Adaptor" introduced="8.1" purpose="optional">
+ <unit bldFile="/sf/os/cellularsrv/basebandabstraction/basebandchanneladaptor/group" mrp="/sf/os/cellularsrv/basebandabstraction/basebandchanneladaptor/group/networking_bca.mrp"/>
+ </component>
+ <component name="isc_if" filter="s60" long-name="Inter-System Communication Interface">
+ <unit bldFile="/sf/os/cellularsrv/basebandabstraction/isc_if/group"/>
+ </component>
+ </collection>
+ <collection name="basebandadaptationplugins" long-name="Baseband Adaptation Plugins" level="adaptation">
+ <component name="basebandchanneladaptorforc32" long-name="Baseband Channel Adaptor for C32" introduced="8.1" purpose="optional" plugin="Y">
+ <unit bldFile="/sf/os/cellularsrv/basebandadaptationplugins/basebandchanneladaptorforc32/group" mrp="/sf/os/cellularsrv/basebandadaptationplugins/basebandchanneladaptorforc32/group/networking_c32bca.mrp"/>
+ </component>
+ </collection>
+ <collection name="fax" long-name="Fax" level="server">
+ <component name="faxclientandserver" long-name="Fax Client and Server" purpose="optional">
+ <unit bldFile="/sf/os/cellularsrv/fax/faxclientandserver/Group" mrp="/sf/os/cellularsrv/fax/faxclientandserver/Group/telephony_fax.mrp"/>
+ </component>
+ </collection>
+ <collection name="smsprotocols" long-name="SMS Protocols" level="framework">
+ <component name="smsstack" long-name="SMS Stack" introduced="6.0" purpose="mandatory" plugin="Y">
+ <unit bldFile="/sf/os/cellularsrv/smsprotocols/smsstack/group" mrp="/sf/os/cellularsrv/smsprotocols/smsstack/group/nbprotocols_smsstackv2.mrp"/>
+ </component>
+ </collection>
+ <collection name="telephonyprotocols" long-name="Telephony Protocols" level="framework">
+ <component name="csdagt" long-name="CSD AGT" introduced="6.1" purpose="optional" plugin="Y">
+ <unit bldFile="/sf/os/cellularsrv/telephonyprotocols/csdagt/group" mrp="/sf/os/cellularsrv/telephonyprotocols/csdagt/group/networking_csdagt.mrp"/>
+ </component>
+ <component name="psdagt" long-name="PSD AGT" introduced="7.0s" purpose="optional" plugin="Y">
+ <unit bldFile="/sf/os/cellularsrv/telephonyprotocols/psdagt/group" mrp="/sf/os/cellularsrv/telephonyprotocols/psdagt/group/networking_psdagt.mrp"/>
+ </component>
+ <component name="gprsumtsqosprt" long-name="GPRS/UMTS QoS PRT" introduced="7.0s" purpose="optional" plugin="Y">
+ <unit bldFile="/sf/os/cellularsrv/telephonyprotocols/gprsumtsqosprt/group" mrp="/sf/os/cellularsrv/telephonyprotocols/gprsumtsqosprt/group/networking_guqos.mrp"/>
+ </component>
+ <component name="gprsumtsqosinterface" long-name="GPRS/UMTS QoS Interface" introduced="7.0s" purpose="optional" plugin="Y">
+ <unit bldFile="/sf/os/cellularsrv/telephonyprotocols/gprsumtsqosinterface/group" mrp="/sf/os/cellularsrv/telephonyprotocols/gprsumtsqosinterface/group/networking_umtsif.mrp"/>
+ </component>
+ <component name="qosextnapi" long-name="QoS Extn API" introduced="9.2" purpose="optional">
+ <unit bldFile="/sf/os/cellularsrv/telephonyprotocols/qosextnapi/group" mrp="/sf/os/cellularsrv/telephonyprotocols/qosextnapi/group/networking_qosextnapi.mrp"/>
+ </component>
+ <component name="secondarypdpcontextumtsdriver" long-name="Secondary PDP context UMTS Driver" introduced="8.1" purpose="optional">
+ <unit bldFile="/sf/os/cellularsrv/telephonyprotocols/secondarypdpcontextumtsdriver/group" mrp="/sf/os/cellularsrv/telephonyprotocols/secondarypdpcontextumtsdriver/group/networking_spud.mrp"/>
+ </component>
+ <component name="qos3gppcpr" long-name="QoS 3GPP CPR" introduced="9.2" purpose="optional" plugin="Y">
+ <unit bldFile="/sf/os/cellularsrv/telephonyprotocols/qos3gppcpr/group" mrp="/sf/os/cellularsrv/telephonyprotocols/qos3gppcpr/group/networking_Qos3GPP.mrp"/>
+ </component>
+ <component name="pdplayer" long-name="PDP Layer" introduced="^3" purpose="optional" plugin="Y">
+ <unit bldFile="/sf/os/cellularsrv/telephonyprotocols/pdplayer/group" mrp="/sf/os/cellularsrv/telephonyprotocols/pdplayer/group/networking_pdp.mrp"/>
+ </component>
+ <component name="rawipnif" long-name="Raw IP NIF" introduced="8.1" purpose="optional" plugin="Y">
+ <unit bldFile="/sf/os/cellularsrv/telephonyprotocols/rawipnif/group" mrp="/sf/os/cellularsrv/telephonyprotocols/rawipnif/group/networking_rawipnif.mrp"/>
+ </component>
+ </collection>
+ <collection name="telephonyserver" long-name="Telephony Server" level="server">
+ <component name="etelserverandcore" long-name="ETel Server and Core" purpose="mandatory">
+ <unit bldFile="/sf/os/cellularsrv/telephonyserver/etelserverandcore/group" mrp="/sf/os/cellularsrv/telephonyserver/etelserverandcore/group/telephony_etel.mrp"/>
+ </component>
+ <component name="etelconfig" long-name="ETel Config" purpose="mandatory" filter="test" class="config">
+ <unit mrp="/sf/os/cellularsrv/telephonyserver/etelserverandcore/group/telephony_etel-config.mrp" bldFile="/sf/os/cellularsrv/telephonyserver/etelserverandcore/data"/>
+ </component>
+ <component name="etelmultimode" long-name="ETel Multimode" introduced="7.0" purpose="mandatory">
+ <unit bldFile="/sf/os/cellularsrv/telephonyserver/etelmultimode/group" mrp="/sf/os/cellularsrv/telephonyserver/etelmultimode/group/telephony_etelmm.mrp"/>
+ </component>
+ <component name="etelpacketdata" long-name="ETel Packet Data" introduced="7.0" purpose="mandatory">
+ <unit bldFile="/sf/os/cellularsrv/telephonyserver/etelpacketdata/group" mrp="/sf/os/cellularsrv/telephonyserver/etelpacketdata/group/telephony_etelpckt.mrp"/>
+ </component>
+ <component name="etelsimtoolkit" long-name="ETel SIM Toolkit" introduced="6.1" purpose="mandatory">
+ <unit bldFile="/sf/os/cellularsrv/telephonyserver/etelsimtoolkit/group" mrp="/sf/os/cellularsrv/telephonyserver/etelsimtoolkit/group/telephony_etelsat.mrp"/>
+ </component>
+ </collection>
+ <collection name="telephonyserverplugins" long-name="Telephony Server Plugins" level="plugin">
+ <component name="common_tsy" long-name="Common TSY" introduced="^2" purpose="optional" plugin="Y">
+ <unit bldFile="/sf/os/cellularsrv/telephonyserverplugins/common_tsy/group" mrp="/sf/os/cellularsrv/telephonyserverplugins/common_tsy/group/telephony_commontsy.mrp"/>
+ </component>
+ <component name="licenseetsystub" long-name="Licensee TSY Stub" introduced="^2" purpose="development" filter="test" plugin="Y">
+ <unit mrp="/sf/os/cellularsrv/telephonyserverplugins/licenseetsystub/group/licenseetsystub.mrp" bldFile="/sf/os/cellularsrv/telephonyserverplugins/licenseetsystub/group"/>
+ </component>
+ <component name="multimodetsy" long-name="Multimode TSY" purpose="development" plugin="Y">
+ <unit bldFile="/sf/os/cellularsrv/telephonyserverplugins/multimodetsy/group" mrp="/sf/os/cellularsrv/telephonyserverplugins/multimodetsy/group/telephony_mmtsy.mrp"/>
+ </component>
+ <component name="simtsy" long-name="SIM TSY" introduced="7.0" purpose="development" plugin="Y">
+ <unit bldFile="/sf/os/cellularsrv/telephonyserverplugins/simtsy/group" mrp="/sf/os/cellularsrv/telephonyserverplugins/simtsy/group/telephony_simtsy.mrp"/>
+ </component>
+ <component name="ctsydispatchlayer" long-name="C-TSY Dispatch Layer" introduced="^3" purpose="optional" plugin="Y">
+ <unit bldFile="/sf/os/cellularsrv/telephonyserverplugins/ctsydispatchlayer/group" mrp="/sf/os/cellularsrv/telephonyserverplugins/ctsydispatchlayer/group/telephony_dispatcher.mrp"/>
+ </component>
+ <component name="simatktsy" long-name="SIMATK TSY" introduced="^3" purpose="optional" plugin="Y">
+ <unit bldFile="/sf/os/cellularsrv/telephonyserverplugins/simatktsy/group" mrp="/sf/os/cellularsrv/telephonyserverplugins/simatktsy/group/commonsimatktsy.mrp"/>
+ </component>
+ </collection>
+ <collection name="commonnetworkinterface" long-name="Common Network Interface" level="hw-if">
+ <component name="gennif" filter="s60" long-name="Generic NIF">
+ <unit bldFile="/sf/os/cellularsrv/commonnetworkinterface/gennif/group"/>
+ </component>
+ <component name="gprsumtsagent" filter="s60" long-name="GPRS UMTS Agent">
+ <unit bldFile="/sf/os/cellularsrv/commonnetworkinterface/gprsumtsagent/group"/>
+ </component>
+ </collection>
+ <collection name="telephonyutils" long-name="Telephony Utilities" level="app-if">
+ <component name="dial" long-name="Dial" deprecated="9.1" purpose="optional">
+ <unit bldFile="/sf/os/cellularsrv/telephonyutils/dial/group" mrp="/sf/os/cellularsrv/telephonyutils/dial/group/telephony_dial.mrp"/>
+ </component>
+ <component name="telephonywatchers" long-name="Telephony Watchers" introduced="6.0" purpose="optional" plugin="Y">
+ <unit bldFile="/sf/os/cellularsrv/telephonyutils/telephonywatchers/group" mrp="/sf/os/cellularsrv/telephonyutils/telephonywatchers/group/telephony_watchers.mrp"/>
+ </component>
+ <component name="etel3rdpartyapi" long-name="ETel 3rd Party API" introduced="7.0" purpose="mandatory">
+ <unit bldFile="/sf/os/cellularsrv/telephonyutils/etel3rdpartyapi/Group" mrp="/sf/os/cellularsrv/telephonyutils/etel3rdpartyapi/Group/telephony_etel3rdparty.mrp"/>
+ </component>
+ </collection>
+ <collection name="cellularsrv_info" long-name="Cellular Baseband Services Info" level="app-if">
+ <component name="cellularsrv_plat" filter="s60" long-name="Cellular Baseband Services Platform Interfaces" class="api">
+ <unit bldFile="/sf/os/cellularsrv/cellularsrv_plat/group"/>
+ </component>
+ <component name="telephonyconfidentialdocs" long-name="Telephony Confidential Documentation" purpose="development" class="doc">
+ <unit mrp="/sf/os/cellularsrv/cellularsrv_info/telephonyconfidentialdocs/telephony_confidential.mrp"/>
+ </component>
+ <component name="telephonydocs" long-name="Telephony Documentation" purpose="development" class="doc">
+ <unit mrp="/sf/os/cellularsrv/cellularsrv_info/telephonydocs/telephony_documentation.mrp"/>
+ </component>
+ <component name="cellularsrv_metadata" long-name="Cellular Baseband Services Metadata" introduced="^2" purpose="development" class="config PC">
+ <unit mrp="/sf/os/cellularsrv/cellularsrv_info/cellularsrv_metadata/cellularsrv_metadata.mrp"/>
+ </component>
+ </collection>
+ <collection name="hwpluginsimulation" long-name="Hardware Plugin Simulation" level="adaptation">
+ <component name="mocksy" long-name="MockSY" introduced="^2" purpose="development" plugin="Y">
+ <unit bldFile="/sf/os/cellularsrv/hwpluginsimulation/mocksy/group" mrp="/sf/os/cellularsrv/hwpluginsimulation/mocksy/group/telephony_tools_mocksy.mrp"/>
+ </component>
+ </collection>
+ <collection name="cellularsrvapitest" long-name="Telephony API Tests" level="app-if">
+ <component name="datatransferhaitest" long-name="Data Transfer HAI Tests" introduced="^2" purpose="development" filter="test">
+ <unit mrp="/sf/os/cellularsrv/cellularsrvapitest/datatransferhaitest/group/datatransferhaitest.mrp" bldFile="/sf/os/cellularsrv/cellularsrvapitest/datatransferhaitest/group"/>
+ </component>
+ <component name="telephonyhaitest" long-name="Telephony HAI Tests" introduced="^2" purpose="development" filter="test">
+ <unit mrp="/sf/os/cellularsrv/cellularsrvapitest/telephonyhaitest/group/telephonyhaitest.mrp" bldFile="/sf/os/cellularsrv/cellularsrvapitest/telephonyhaitest/group"/>
+ </component>
+ <component name="telephonydevsoundhaitest" long-name="DevSound Telephony HAI Tests" introduced="^2" purpose="development" filter="test">
+ <unit mrp="/sf/os/cellularsrv/cellularsrvapitest/telephonydevsoundhaitest/group/telephonydevsoundhaitest.mrp" bldFile="/sf/os/cellularsrv/cellularsrvapitest/telephonydevsoundhaitest/group"/>
+ </component>
+ </collection>
+ </block>
+ </layer>
+ </systemModel>
+</SystemDefinition>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/symbian3/os/cellularsrv/package_definition_3.0.xml Mon Feb 15 18:25:55 2010 +0000
@@ -0,0 +1,143 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<SystemDefinition schema="3.0.0">
+ <package id="cellularsrv" name="Cellular Baseband Services" levels="adaptation hw-if plugin framework server app-if">
+ <collection id="basebandabstraction" name="Baseband Abstraction" level="hw-if">
+ <component id="basebandchanneladaptor" name="Baseband Channel Adaptor" introduced="8.1" purpose="optional">
+ <unit bldFile="basebandabstraction/basebandchanneladaptor/group" mrp="basebandabstraction/basebandchanneladaptor/group/networking_bca.mrp"/>
+ </component>
+ <component id="isc_if" filter="s60" name="Inter-System Communication Interface">
+ <unit bldFile="basebandabstraction/isc_if/group"/>
+ </component>
+ </collection>
+ <collection id="basebandadaptationplugins" name="Baseband Adaptation Plugins" level="adaptation">
+ <component id="basebandchanneladaptorforc32" name="Baseband Channel Adaptor for C32" introduced="8.1" purpose="optional" class="plugin">
+ <unit bldFile="basebandadaptationplugins/basebandchanneladaptorforc32/group" mrp="basebandadaptationplugins/basebandchanneladaptorforc32/group/networking_c32bca.mrp"/>
+ </component>
+ </collection>
+ <collection id="fax" name="Fax" level="server">
+ <component id="faxclientandserver" name="Fax Client and Server" purpose="optional">
+ <unit bldFile="fax/faxclientandserver/Group" mrp="fax/faxclientandserver/Group/telephony_fax.mrp"/>
+ </component>
+ </collection>
+ <collection id="smsprotocols" name="SMS Protocols" level="framework">
+ <component id="smsstack" name="SMS Stack" introduced="6.0" purpose="mandatory" class="plugin">
+ <unit bldFile="smsprotocols/smsstack/group" mrp="smsprotocols/smsstack/group/nbprotocols_smsstackv2.mrp"/>
+ </component>
+ </collection>
+ <collection id="telephonyprotocols" name="Telephony Protocols" level="framework">
+ <component id="csdagt" name="CSD AGT" introduced="6.1" purpose="optional" class="plugin">
+ <unit bldFile="telephonyprotocols/csdagt/group" mrp="telephonyprotocols/csdagt/group/networking_csdagt.mrp"/>
+ </component>
+ <component id="psdagt" name="PSD AGT" introduced="7.0s" purpose="optional" class="plugin">
+ <unit bldFile="telephonyprotocols/psdagt/group" mrp="telephonyprotocols/psdagt/group/networking_psdagt.mrp"/>
+ </component>
+ <component id="gprsumtsqosprt" name="GPRS/UMTS QoS PRT" introduced="7.0s" purpose="optional" class="plugin">
+ <unit bldFile="telephonyprotocols/gprsumtsqosprt/group" mrp="telephonyprotocols/gprsumtsqosprt/group/networking_guqos.mrp"/>
+ </component>
+ <component id="gprsumtsqosinterface" name="GPRS/UMTS QoS Interface" introduced="7.0s" purpose="optional" class="plugin">
+ <unit bldFile="telephonyprotocols/gprsumtsqosinterface/group" mrp="telephonyprotocols/gprsumtsqosinterface/group/networking_umtsif.mrp"/>
+ </component>
+ <component id="qosextnapi" name="QoS Extn API" introduced="9.2" purpose="optional">
+ <unit bldFile="telephonyprotocols/qosextnapi/group" mrp="telephonyprotocols/qosextnapi/group/networking_qosextnapi.mrp"/>
+ </component>
+ <component id="secondarypdpcontextumtsdriver" name="Secondary PDP context UMTS Driver" introduced="8.1" purpose="optional">
+ <unit bldFile="telephonyprotocols/secondarypdpcontextumtsdriver/group" mrp="telephonyprotocols/secondarypdpcontextumtsdriver/group/networking_spud.mrp"/>
+ </component>
+ <component id="qos3gppcpr" name="QoS 3GPP CPR" introduced="9.2" purpose="optional" class="plugin">
+ <unit bldFile="telephonyprotocols/qos3gppcpr/group" mrp="telephonyprotocols/qos3gppcpr/group/networking_Qos3GPP.mrp"/>
+ </component>
+ <component id="pdplayer" name="PDP Layer" introduced="^3" purpose="optional" class="plugin">
+ <unit bldFile="telephonyprotocols/pdplayer/group" mrp="telephonyprotocols/pdplayer/group/networking_pdp.mrp"/>
+ </component>
+ <component id="rawipnif" name="Raw IP NIF" introduced="8.1" purpose="optional" class="plugin">
+ <unit bldFile="telephonyprotocols/rawipnif/group" mrp="telephonyprotocols/rawipnif/group/networking_rawipnif.mrp"/>
+ </component>
+ </collection>
+ <collection id="telephonyserver" name="Telephony Server" level="server">
+ <component id="etelserverandcore" name="ETel Server and Core" purpose="mandatory">
+ <unit bldFile="telephonyserver/etelserverandcore/group" mrp="telephonyserver/etelserverandcore/group/telephony_etel.mrp"/>
+ </component>
+ <component id="etelconfig" name="ETel Config" purpose="mandatory" class="config" filter="test">
+ <unit mrp="telephonyserver/etelserverandcore/group/telephony_etel-config.mrp" bldFile="telephonyserver/etelserverandcore/data"/>
+ </component>
+ <component id="etelmultimode" name="ETel Multimode" introduced="7.0" purpose="mandatory">
+ <unit bldFile="telephonyserver/etelmultimode/group" mrp="telephonyserver/etelmultimode/group/telephony_etelmm.mrp"/>
+ </component>
+ <component id="etelpacketdata" name="ETel Packet Data" introduced="7.0" purpose="mandatory">
+ <unit bldFile="telephonyserver/etelpacketdata/group" mrp="telephonyserver/etelpacketdata/group/telephony_etelpckt.mrp"/>
+ </component>
+ <component id="etelsimtoolkit" name="ETel SIM Toolkit" introduced="6.1" purpose="mandatory">
+ <unit bldFile="telephonyserver/etelsimtoolkit/group" mrp="telephonyserver/etelsimtoolkit/group/telephony_etelsat.mrp"/>
+ </component>
+ </collection>
+ <collection id="telephonyserverplugins" name="Telephony Server Plugins" level="plugin">
+ <component id="common_tsy" name="Common TSY" introduced="^2" purpose="optional" class="plugin">
+ <unit bldFile="telephonyserverplugins/common_tsy/group" mrp="telephonyserverplugins/common_tsy/group/telephony_commontsy.mrp"/>
+ </component>
+ <component id="licenseetsystub" name="Licensee TSY Stub" introduced="^2" purpose="development" class="plugin" filter="test">
+ <unit mrp="telephonyserverplugins/licenseetsystub/group/licenseetsystub.mrp" bldFile="telephonyserverplugins/licenseetsystub/group"/>
+ </component>
+ <component id="multimodetsy" name="Multimode TSY" purpose="development" class="plugin">
+ <unit bldFile="telephonyserverplugins/multimodetsy/group" mrp="telephonyserverplugins/multimodetsy/group/telephony_mmtsy.mrp"/>
+ </component>
+ <component id="simtsy" name="SIM TSY" introduced="7.0" purpose="development" class="plugin">
+ <unit bldFile="telephonyserverplugins/simtsy/group" mrp="telephonyserverplugins/simtsy/group/telephony_simtsy.mrp"/>
+ </component>
+ <component id="ctsydispatchlayer" name="C-TSY Dispatch Layer" introduced="^3" purpose="optional" class="plugin">
+ <unit bldFile="telephonyserverplugins/ctsydispatchlayer/group" mrp="telephonyserverplugins/ctsydispatchlayer/group/telephony_dispatcher.mrp"/>
+ </component>
+ <component id="simatktsy" name="SIMATK TSY" introduced="^3" purpose="optional" class="plugin">
+ <unit bldFile="telephonyserverplugins/simatktsy/group" mrp="telephonyserverplugins/simatktsy/group/commonsimatktsy.mrp"/>
+ </component>
+ </collection>
+ <collection id="commonnetworkinterface" name="Common Network Interface" level="hw-if">
+ <component id="gennif" filter="s60" name="Generic NIF">
+ <unit bldFile="commonnetworkinterface/gennif/group"/>
+ </component>
+ <component id="gprsumtsagent" filter="s60" name="GPRS UMTS Agent">
+ <unit bldFile="commonnetworkinterface/gprsumtsagent/group"/>
+ </component>
+ </collection>
+ <collection id="telephonyutils" name="Telephony Utilities" level="app-if">
+ <component id="dial" name="Dial" deprecated="9.1" purpose="optional">
+ <unit bldFile="telephonyutils/dial/group" mrp="telephonyutils/dial/group/telephony_dial.mrp"/>
+ </component>
+ <component id="telephonywatchers" name="Telephony Watchers" introduced="6.0" purpose="optional" class="plugin">
+ <unit bldFile="telephonyutils/telephonywatchers/group" mrp="telephonyutils/telephonywatchers/group/telephony_watchers.mrp"/>
+ </component>
+ <component id="etel3rdpartyapi" name="ETel 3rd Party API" introduced="7.0" purpose="mandatory">
+ <unit bldFile="telephonyutils/etel3rdpartyapi/Group" mrp="telephonyutils/etel3rdpartyapi/Group/telephony_etel3rdparty.mrp"/>
+ </component>
+ </collection>
+ <collection id="cellularsrv_info" name="Cellular Baseband Services Info" level="app-if">
+ <component id="cellularsrv_plat" filter="s60" name="Cellular Baseband Services Platform Interfaces" class="api">
+ <unit bldFile="cellularsrv_plat/group"/>
+ </component>
+ <component id="telephonyconfidentialdocs" name="Telephony Confidential Documentation" purpose="development" class="doc">
+ <unit mrp="cellularsrv_info/telephonyconfidentialdocs/telephony_confidential.mrp"/>
+ </component>
+ <component id="telephonydocs" name="Telephony Documentation" purpose="development" class="doc">
+ <unit mrp="cellularsrv_info/telephonydocs/telephony_documentation.mrp"/>
+ </component>
+ <component id="cellularsrv_metadata" name="Cellular Baseband Services Metadata" class="config" introduced="^2" purpose="development" target="desktop">
+ <unit mrp="cellularsrv_info/cellularsrv_metadata/cellularsrv_metadata.mrp"/>
+ </component>
+ </collection>
+ <collection id="hwpluginsimulation" name="Hardware Plugin Simulation" level="adaptation">
+ <component id="mocksy" name="MockSY" introduced="^2" purpose="development" class="plugin">
+ <unit bldFile="hwpluginsimulation/mocksy/group" mrp="hwpluginsimulation/mocksy/group/telephony_tools_mocksy.mrp"/>
+ </component>
+ </collection>
+ <collection id="cellularsrvapitest" name="Telephony API Tests" level="app-if">
+ <component id="datatransferhaitest" name="Data Transfer HAI Tests" introduced="^2" purpose="development" filter="test">
+ <unit mrp="cellularsrvapitest/datatransferhaitest/group/datatransferhaitest.mrp" bldFile="cellularsrvapitest/datatransferhaitest/group"/>
+ </component>
+ <component id="telephonyhaitest" name="Telephony HAI Tests" introduced="^2" purpose="development" filter="test">
+ <unit mrp="cellularsrvapitest/telephonyhaitest/group/telephonyhaitest.mrp" bldFile="cellularsrvapitest/telephonyhaitest/group"/>
+ </component>
+ <component id="telephonydevsoundhaitest" name="DevSound Telephony HAI Tests" introduced="^2" purpose="development" filter="test">
+ <unit mrp="cellularsrvapitest/telephonydevsoundhaitest/group/telephonydevsoundhaitest.mrp" bldFile="cellularsrvapitest/telephonydevsoundhaitest/group"/>
+ </component>
+ </collection>
+ </package>
+</SystemDefinition>
--- a/symbian3/os/commsfw/package_definition.xml Fri Feb 12 16:37:22 2010 +0000
+++ b/symbian3/os/commsfw/package_definition.xml Mon Feb 15 18:25:55 2010 +0000
@@ -1,192 +1,167 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE SystemDefinition [
- <!ELEMENT SystemDefinition (systemModel?,SystemBuild?)>
- <!ATTLIST SystemDefinition
- name CDATA #REQUIRED
- schema CDATA #REQUIRED>
- <!ELEMENT systemModel (layer+)>
- <!ELEMENT layer (block*|collection*)*>
- <!ATTLIST layer
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED
- levels NMTOKENS #IMPLIED
- span CDATA #IMPLIED>
- <!ELEMENT block (subblock*|collection*)*>
- <!ATTLIST block
- levels NMTOKENS #IMPLIED
- span CDATA #IMPLIED
- level NMTOKEN #IMPLIED
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED>
- <!ELEMENT subblock (collection)*>
- <!ATTLIST subblock
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED>
- <!ELEMENT collection (component)*>
- <!ATTLIST collection
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED
- level NMTOKEN #IMPLIED>
- <!ELEMENT component (unit)*>
- <!ATTLIST component
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED
- deprecated CDATA #IMPLIED
- introduced CDATA #IMPLIED
- contract CDATA #IMPLIED
- plugin (Y|N) 'N'
- filter CDATA #IMPLIED
- class NMTOKENS #IMPLIED
- supports CDATA #IMPLIED
- purpose (optional|mandatory|development) 'optional'>
- <!ELEMENT unit EMPTY>
- <!ATTLIST unit
- mrp CDATA #IMPLIED
- filter CDATA #IMPLIED
- bldFile CDATA #IMPLIED
- root CDATA #IMPLIED
- version NMTOKEN #IMPLIED
- prebuilt NMTOKEN #IMPLIED
- late (Y|N) #IMPLIED
- priority CDATA #IMPLIED>
- <!ELEMENT SystemBuild (option*|target+|targetList+|list+|configuration+)*>
- <!ATTLIST SystemBuild schema CDATA #REQUIRED>
- <!ELEMENT list (ref+)>
- <!ATTLIST list
- name ID #REQUIRED
- description CDATA #REQUIRED>
- <!ELEMENT ref EMPTY>
- <!ATTLIST ref item CDATA #REQUIRED>
- <!ELEMENT targetList EMPTY>
- <!ATTLIST targetList
- name ID #REQUIRED
- description CDATA #REQUIRED
- target IDREFS #REQUIRED>
- <!ELEMENT target EMPTY>
- <!ATTLIST target
- name ID #REQUIRED
- abldTarget CDATA #REQUIRED
- description CDATA #REQUIRED>
- <!ELEMENT option EMPTY>
- <!ATTLIST option
- name ID #REQUIRED
- abldOption CDATA #REQUIRED
- description CDATA #REQUIRED
- enable (Y|N) #REQUIRED>
- <!ELEMENT configuration (listRef+|ref+|task+)*>
- <!ATTLIST configuration
- name ID #REQUIRED
- description CDATA #REQUIRED
- filter CDATA #REQUIRED>
- <!ELEMENT task (listRef*,(buildLayer|specialInstructions))>
- <!ELEMENT listRef EMPTY>
- <!ATTLIST listRef list CDATA #REQUIRED>
- <!ELEMENT buildLayer EMPTY>
- <!ATTLIST buildLayer
- command CDATA #REQUIRED
- targetList IDREFS #IMPLIED
- unitParallel (Y|N) #REQUIRED
- targetParallel (Y|N) 'N'>
- <!ELEMENT specialInstructions EMPTY>
- <!ATTLIST specialInstructions
- name CDATA #REQUIRED
- cwd CDATA #REQUIRED
- root CDATA #IMPLIED
- command CDATA #REQUIRED>
-]>
-<SystemDefinition schema="2.0.1" name="Symbian^3">
-<systemModel>
-<layer name="os" long-name="OS" levels="hw services">
-<block name="commsfw" level="services" long-name="Communications Framework" levels="server support framework process app-if">
-<collection name="commsprocess" long-name="Comms Process" level="process">
-<component name="commsrootserver" long-name="Comms Root Server" introduced="7.0s" purpose="mandatory">
-<unit bldFile="/sf/os/commsfw/commsprocess/commsrootserverconfig/group" mrp="/sf/os/commsfw/commsprocess/commsrootserverconfig/group/comms-infras_rootserver.mrp"/>
-</component>
-<component name="commsrootserverconfig" long-name="Comms Root Server Config" introduced="9.1" purpose="mandatory" class="config">
-<unit mrp="/sf/os/commsfw/commsprocess/commsrootserverconfig/group/comms-infras_rootserver-config.mrp"/>
-</component>
-</collection>
-<collection name="commsconfig" long-name="Comms Config" level="process">
-<component name="commsdatabase" long-name="Comms Database" purpose="mandatory">
-<unit bldFile="/sf/os/commsfw/commsfwtools/preparedefaultcommsdatabase/group" mrp="/sf/os/commsfw/commsfwtools/preparedefaultcommsdatabase/group/comms-infras_commsdat.mrp"/>
-</component>
-<component name="commsdatabaseshim" long-name="Comms Database Shim" introduced="8.1" purpose="mandatory">
-<unit bldFile="/sf/os/commsfw/commsconfig/commsdatabaseshim/group" mrp="/sf/os/commsfw/commsconfig/commsdatabaseshim/group/comms-infras_commdbshim.mrp"/>
-</component>
-</collection>
-<collection name="datacommsserver" long-name="Data Comms Server" level="framework">
-<component name="esockserver" long-name="ESock Server" purpose="mandatory">
-<unit bldFile="/sf/os/commsfw/datacommsserver/esockserver/group" mrp="/sf/os/commsfw/datacommsserver/esockserver/group/comms-infras_esock.mrp" version="3"/>
-</component>
-<component name="esockserverconfig" long-name="ESock Server Config" introduced="9.1" purpose="mandatory" class="config">
-<unit mrp="/sf/os/commsfw/datacommsserver/esockserver/group/comms-infras_esock-config.mrp" version="3"/>
-</component>
-<component name="networkinterfacemgr" long-name="Network Interface Manager" introduced="ER5U" purpose="mandatory">
-<unit bldFile="/sf/os/commsfw/datacommsserver/networkinterfacemgr/group" mrp="/sf/os/commsfw/datacommsserver/networkinterfacemgr/group/comms-infras_nifman.mrp" version="2"/>
-</component>
-<component name="networkingdialogapi" long-name="Networking Dialog API" introduced="6.1" purpose="optional">
-<unit bldFile="/sf/os/commsfw/datacommsserver/networkingdialogapi/group" mrp="/sf/os/commsfw/datacommsserver/networkingdialogapi/group/networking_dialog.mrp"/>
-</component>
-<component name="networkingdialogstub" long-name="Networking Dialog Stub" introduced="6.1" purpose="optional">
-<unit bldFile="/sf/os/commsfw/datacommsserver/networkingdialogapi/default" mrp="/sf/os/commsfw/datacommsserver/networkingdialogapi/default/networking_dialog_default.mrp"/>
-</component>
-<component name="networkcontroller" long-name="Network Controller" introduced="7.0s" purpose="optional" plugin="Y">
-<unit bldFile="/sf/os/commsfw/datacommsserver/networkcontroller/group" mrp="/sf/os/commsfw/datacommsserver/networkcontroller/group/networking_netcon.mrp"/>
-</component>
-</collection>
-<collection name="serialserver" long-name="Serial Server" level="server">
-<component name="serialportcsy" long-name="Serial Port CSY" introduced="ER5" purpose="optional" plugin="Y">
-<unit bldFile="/sf/os/commsfw/serialserver/serialportcsy" mrp="/sf/os/commsfw/serialserver/serialportcsy/ser-comms_serialportcsy.mrp"/>
-</component>
-<component name="packetloopbackcsy" long-name="Packet Loopback CSY" introduced="8.1" purpose="development">
-<unit bldFile="/sf/os/commsfw/serialserver/packetloopbackcsy/group" mrp="/sf/os/commsfw/serialserver/packetloopbackcsy/group/PacketLoopbackCSY.mrp"/>
-</component>
-<component name="c32serialserver" long-name="C32 Serial Server" introduced="ER5" purpose="mandatory">
-<unit bldFile="/sf/os/commsfw/serialserver/c32serialserver/group" mrp="/sf/os/commsfw/serialserver/c32serialserver/group/ser-comms_c32.mrp"/>
-</component>
-<component name="c32serialserverconfig" long-name="C32 Serial Server Config" introduced="ER5" purpose="mandatory" class="config">
-<unit bldFile="/sf/os/commsfw/serialserver/c32serialserverconfig" mrp="/sf/os/commsfw/serialserver/c32serialserverconfig/ser-comms_c32-config.mrp"/>
-</component>
-<component name="c32serialserverdocs" long-name="C32 Serial Server Documentation" purpose="development" class="doc">
-<unit mrp="/sf/os/commsfw/serialserver/c32serialserverdocs/ser-comms_documentation.mrp"/>
-</component>
-</collection>
-<collection name="commsfwutils" long-name="Comms Framework Utilities" level="framework">
-<component name="commsbufs" long-name="Comms Buffers" introduced="tb92" purpose="mandatory">
-<!-- <unit bldFile="/sf/os\unref\orphan\comgen\comms-infras\commsbufs\group" mrp="/sf/os\unref\orphan\comgen\comms-infras\commsbufs\group\comms-infras_commsbufs.mrp"/> -->
- <unit bldFile="/sf/os/commsfw/commsfwutils/commsbufs/group" mrp="/sf/os/commsfw/commsfwutils/commsbufs/group/comms-infras_commsbufs.mrp"/>
-</component>
-</collection>
-<collection name="commsfw_info" long-name="Comms Framework Info" level="app-if">
-<component name="commsinfrastructuredocs" long-name="Comms Infrastructure Documentation" introduced="7.0" purpose="development" class="doc">
-<unit mrp="/sf/os/commsfw/commsfw_info/commsinfrastructuredocs/comms-infras_documentation.mrp"/>
-</component>
-<component name="commsfw_metadata" long-name="Communications Framework Metadata" introduced="tb91" purpose="development" class="config PC">
-<unit mrp="/sf/os/commsfw/commsfw_info/commsfw_metadata/commsfw_metadata.mrp"/>
-</component>
-</collection>
-<collection name="commsfwsupport" long-name="Comms Framework Support" level="support">
-<component name="commselements" long-name="Comms Elements" introduced="8.0" purpose="mandatory">
-<unit bldFile="/sf/os/commsfw/commsfwsupport/commselements/group" mrp="/sf/os/commsfw/commsfwsupport/commselements/group/comms-infras_elements.mrp"/>
-</component>
-</collection>
-<collection name="commsinfrastructureapitest" long-name="Comms-Infras API Tests" level="app-if">
-<component name="commsinfrastructuresvs" long-name="Comms Infrastructure Verification Suite" introduced="tb92" purpose="development">
-<unit mrp="/sf/os/commsfw/commsinfrastructureapitest/commsinfrastructuresvs/group/commsinfrastructuresvs.mrp"/>
-</component>
-</collection>
-<collection name="commsfwtools" long-name="Comms Framework Tools" level="app-if">
-<component name="preparedefaultcommsdatabase" long-name="Prepare Default Comms Database" filter="gt" purpose="mandatory" class="config PC">
-<unit bldFile="/sf/os/commsfw/commsfwtools/preparedefaultcommsdatabase/defaultcommdb/group" mrp="/sf/os/commsfw/commsfwtools/preparedefaultcommsdatabase/defaultcommdb/group/comms-infras_defaultcommdb.mrp"/>
-</component>
-<component name="installdefaultcommsdatabase" long-name="Install Default Comms Database" purpose="mandatory" class="PC">
-<unit bldFile="/sf/os/commsfw/commsfwtools/preparedefaultcommsdatabase/installdefaultcommdb/group" mrp="/sf/os/commsfw/commsfwtools/preparedefaultcommsdatabase/installdefaultcommdb/group/comms-infras_installdefaultcommdb.mrp" priority="1010"/>
-</component>
-<component name="commstools" long-name="Comms Tools" introduced="tb91" purpose="development" class="PC">
-<unit mrp="/sf/os/commsfw/commsfwtools/commstools/group/comms-infras_tools.mrp"/>
-</component>
-</collection>
-</block>
-</layer>
-</systemModel>
-</SystemDefinition>
\ No newline at end of file
+<!DOCTYPE SystemDefinition [
+<!ELEMENT SystemDefinition ( systemModel )>
+<!ATTLIST SystemDefinition
+ name CDATA #REQUIRED
+ schema CDATA #REQUIRED
+>
+<!-- all paths are relative to the environment variable specified by the root attribute, or SOURCEROOT if not. -->
+
+<!-- System Model Section of DTD -->
+<!ELEMENT systemModel (layer+)>
+
+<!ELEMENT layer (block* | collection*)*>
+<!-- Kernel Services, Base Services, OS Services, Etc -->
+<!ATTLIST layer
+ name CDATA #REQUIRED
+ long-name CDATA #IMPLIED
+ levels NMTOKENS #IMPLIED
+ span CDATA #IMPLIED
+>
+
+<!ELEMENT block (subblock* | collection*)*>
+ <!-- Generic OS services, Comms Services, etc -->
+<!ATTLIST block
+ levels NMTOKENS #IMPLIED
+ span CDATA #IMPLIED
+ level NMTOKEN #IMPLIED
+ name CDATA #REQUIRED
+ long-name CDATA #IMPLIED
+>
+
+<!ELEMENT subblock (collection)*>
+<!-- Cellular Baseband Services, Networking Services, etc -->
+<!ATTLIST subblock
+ name CDATA #REQUIRED
+ long-name CDATA #IMPLIED
+>
+
+<!ELEMENT collection (component)*>
+<!-- Screen Driver, Content Handling, etc -->
+<!ATTLIST collection
+ name CDATA #REQUIRED
+ long-name CDATA #IMPLIED
+ level NMTOKEN #IMPLIED
+>
+
+<!ELEMENT component (unit)*>
+<!-- contains units or is a package or prebuilt -->
+<!ATTLIST component
+ name CDATA #REQUIRED
+ long-name CDATA #IMPLIED
+ deprecated CDATA #IMPLIED
+ introduced CDATA #IMPLIED
+ contract CDATA #IMPLIED
+ plugin (Y|N) "N"
+ filter CDATA #IMPLIED
+ class NMTOKENS #IMPLIED
+ supports CDATA #IMPLIED
+ purpose ( optional | mandatory | development ) "optional"
+>
+
+<!ELEMENT unit EMPTY >
+<!-- must be buildable (bld.inf) -->
+<!-- bldFile may someday be removed in favour of mrp -->
+<!ATTLIST unit
+ mrp CDATA #IMPLIED
+ filter CDATA #IMPLIED
+ bldFile CDATA #IMPLIED
+ root CDATA #IMPLIED
+ version NMTOKEN #IMPLIED
+ prebuilt NMTOKEN #IMPLIED
+ late (Y|N) #IMPLIED
+ priority CDATA #IMPLIED
+>
+]>
+<SystemDefinition name="Symbian^3" schema="2.0.1">
+ <systemModel>
+ <layer name="os" long-name="OS" levels="hw services">
+ <block name="commsfw" level="services" long-name="Communications Framework" levels="server support framework process app-if">
+ <collection name="commsprocess" long-name="Comms Process" level="process">
+ <component name="commsrootserver" long-name="Comms Root Server" introduced="7.0s" purpose="mandatory">
+ <unit bldFile="/sf/os/commsfw/commsprocess/commsrootserverconfig/group" mrp="/sf/os/commsfw/commsprocess/commsrootserverconfig/group/comms-infras_rootserver.mrp"/>
+ </component>
+ <component name="commsrootserverconfig" long-name="Comms Root Server Config" introduced="9.1" purpose="mandatory" filter="test" class="config">
+ <unit mrp="/sf/os/commsfw/commsprocess/commsrootserverconfig/group/comms-infras_rootserver-config.mrp" bldFile="/sf/os/commsfw/commsprocess/commsrootserverconfig/etc"/>
+ </component>
+ </collection>
+ <collection name="commsconfig" long-name="Comms Config" level="process">
+ <component name="commsdatabase" long-name="Comms Database" purpose="mandatory">
+ <unit bldFile="/sf/os/commsfw/commsfwtools/preparedefaultcommsdatabase/group" mrp="/sf/os/commsfw/commsfwtools/preparedefaultcommsdatabase/group/comms-infras_commsdat.mrp"/>
+ </component>
+ <component name="commsdatabaseshim" long-name="Comms Database Shim" introduced="8.1" purpose="mandatory">
+ <unit bldFile="/sf/os/commsfw/commsconfig/commsdatabaseshim/group" mrp="/sf/os/commsfw/commsconfig/commsdatabaseshim/group/comms-infras_commdbshim.mrp"/>
+ </component>
+ </collection>
+ <collection name="datacommsserver" long-name="Data Comms Server" level="framework">
+ <component name="esockserver" long-name="ESock Server" purpose="mandatory">
+ <unit bldFile="/sf/os/commsfw/datacommsserver/esockserver/group" mrp="/sf/os/commsfw/datacommsserver/esockserver/group/comms-infras_esock.mrp" version="3"/>
+ </component>
+ <component name="esockserverconfig" long-name="ESock Server Config" introduced="9.1" purpose="mandatory" filter="test" class="config">
+ <unit mrp="/sf/os/commsfw/datacommsserver/esockserver/group/comms-infras_esock-config.mrp" bldFile="/sf/os/commsfw/datacommsserver/esockserver/etc" version="3"/>
+ </component>
+ <component name="networkingdialogapi" long-name="Networking Dialog API" introduced="6.1" purpose="optional">
+ <unit bldFile="/sf/os/commsfw/datacommsserver/networkingdialogapi/group" mrp="/sf/os/commsfw/datacommsserver/networkingdialogapi/group/networking_dialog.mrp"/>
+ </component>
+ <component name="networkingdialogstub" long-name="Networking Dialog Stub" introduced="6.1" purpose="optional">
+ <unit bldFile="/sf/os/commsfw/datacommsserver/networkingdialogapi/default" mrp="/sf/os/commsfw/datacommsserver/networkingdialogapi/default/networking_dialog_default.mrp"/>
+ </component>
+ <component name="networkcontroller" long-name="Network Controller" introduced="7.0s" purpose="optional" plugin="Y">
+ <unit bldFile="/sf/os/commsfw/datacommsserver/networkcontroller/group" mrp="/sf/os/commsfw/datacommsserver/networkcontroller/group/networking_netcon.mrp"/>
+ </component>
+ </collection>
+ <collection name="serialserver" long-name="Serial Server" level="server">
+ <component name="serialportcsy" long-name="Serial Port CSY" introduced="ER5" purpose="optional" plugin="Y">
+ <unit bldFile="/sf/os/commsfw/serialserver/serialportcsy" mrp="/sf/os/commsfw/serialserver/serialportcsy/ser-comms_serialportcsy.mrp"/>
+ </component>
+ <component name="packetloopbackcsy" long-name="Packet Loopback CSY" introduced="8.1" purpose="development">
+ <unit bldFile="/sf/os/commsfw/serialserver/packetloopbackcsy/group" mrp="/sf/os/commsfw/serialserver/packetloopbackcsy/group/PacketLoopbackCSY.mrp"/>
+ </component>
+ <component name="c32serialserver" long-name="C32 Serial Server" introduced="ER5" purpose="mandatory">
+ <unit bldFile="/sf/os/commsfw/serialserver/c32serialserver/group" mrp="/sf/os/commsfw/serialserver/c32serialserver/group/ser-comms_c32.mrp"/>
+ </component>
+ <component name="c32serialserverconfig" long-name="C32 Serial Server Config" introduced="ER5" purpose="mandatory" class="config">
+ <unit bldFile="/sf/os/commsfw/serialserver/c32serialserverconfig" mrp="/sf/os/commsfw/serialserver/c32serialserverconfig/ser-comms_c32-config.mrp"/>
+ </component>
+ <component name="c32serialserverdocs" long-name="C32 Serial Server Documentation" purpose="development" class="doc">
+ <unit mrp="/sf/os/commsfw/serialserver/c32serialserverdocs/ser-comms_documentation.mrp"/>
+ </component>
+ </collection>
+ <collection name="commsfwutils" long-name="Comms Framework Utilities" level="framework">
+ <component name="commsbufs" long-name="Comms Buffers" introduced="^3" purpose="mandatory">
+ <unit bldFile="/sf/os/commsfw/commsfwutils/commsbufs/group" mrp="/sf/os/commsfw/commsfwutils/commsbufs/group/comms-infras_commsbufs.mrp"/>
+ </component>
+ </collection>
+ <collection name="commsfw_info" long-name="Comms Framework Info" level="app-if">
+ <component name="commsinfrastructuredocs" long-name="Comms Infrastructure Documentation" introduced="7.0" purpose="development" class="doc">
+ <unit mrp="/sf/os/commsfw/commsfw_info/commsinfrastructuredocs/comms-infras_documentation.mrp"/>
+ </component>
+ <component name="commsfw_metadata" long-name="Communications Framework Metadata" introduced="^2" purpose="development" class="config PC">
+ <unit mrp="/sf/os/commsfw/commsfw_info/commsfw_metadata/commsfw_metadata.mrp"/>
+ </component>
+ </collection>
+ <collection name="commsfwsupport" long-name="Comms Framework Support" level="support">
+ <component name="commselements" long-name="Comms Elements" introduced="8.0" purpose="mandatory">
+ <unit bldFile="/sf/os/commsfw/commsfwsupport/commselements/group" mrp="/sf/os/commsfw/commsfwsupport/commselements/group/comms-infras_elements.mrp"/>
+ </component>
+ </collection>
+ <collection name="commsinfrastructureapitest" long-name="Comms-Infras API Tests" level="app-if">
+ <component name="commsinfrastructuresvs" long-name="Comms Infrastructure Verification Suite" introduced="^3" purpose="development">
+ <unit mrp="/sf/os/commsfw/commsinfrastructureapitest/commsinfrastructuresvs/group/commsinfrastructuresvs.mrp"/>
+ </component>
+ </collection>
+ <collection name="commsfwtools" long-name="Comms Framework Tools" level="app-if">
+ <component name="preparedefaultcommsdatabase" long-name="Prepare Default Comms Database" filter="gt" purpose="mandatory" class="config PC">
+ <unit bldFile="/sf/os/commsfw/commsfwtools/preparedefaultcommsdatabase/defaultcommdb/group" mrp="/sf/os/commsfw/commsfwtools/preparedefaultcommsdatabase/defaultcommdb/group/comms-infras_defaultcommdb.mrp"/>
+ </component>
+ <component name="installdefaultcommsdatabase" long-name="Install Default Comms Database" purpose="mandatory" class="PC">
+ <unit bldFile="/sf/os/commsfw/commsfwtools/preparedefaultcommsdatabase/installdefaultcommdb/group" mrp="/sf/os/commsfw/commsfwtools/preparedefaultcommsdatabase/installdefaultcommdb/group/comms-infras_installdefaultcommdb.mrp" priority="1010"/>
+ </component>
+ <component name="commstools" long-name="Comms Tools" introduced="^3" purpose="development" class="PC">
+ <unit bldFile="/sf/os/commsfw/commsfwtools/commstools/group" mrp="/sf/os/commsfw/commsfwtools/commstools/group/comms-infras_tools.mrp"/>
+ </component>
+ </collection>
+ </block>
+ </layer>
+ </systemModel>
+</SystemDefinition>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/symbian3/os/commsfw/package_definition_3.0.xml Mon Feb 15 18:25:55 2010 +0000
@@ -0,0 +1,89 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<SystemDefinition schema="3.0.0">
+ <package id="commsfw" name="Communications Framework" levels="server support framework process app-if">
+ <collection id="commsprocess" name="Comms Process" level="process">
+ <component id="commsrootserver" name="Comms Root Server" introduced="7.0s" purpose="mandatory">
+ <unit bldFile="commsprocess/commsrootserverconfig/group" mrp="commsprocess/commsrootserverconfig/group/comms-infras_rootserver.mrp"/>
+ </component>
+ <component id="commsrootserverconfig" name="Comms Root Server Config" introduced="9.1" purpose="mandatory" class="config" filter="test">
+ <unit mrp="commsprocess/commsrootserverconfig/group/comms-infras_rootserver-config.mrp" bldFile="commsprocess/commsrootserverconfig/etc"/>
+ </component>
+ </collection>
+ <collection id="commsconfig" name="Comms Config" level="process">
+ <component id="commsdatabase" name="Comms Database" purpose="mandatory">
+ <unit bldFile="commsfwtools/preparedefaultcommsdatabase/group" mrp="commsfwtools/preparedefaultcommsdatabase/group/comms-infras_commsdat.mrp"/>
+ </component>
+ <component id="commsdatabaseshim" name="Comms Database Shim" introduced="8.1" purpose="mandatory">
+ <unit bldFile="commsconfig/commsdatabaseshim/group" mrp="commsconfig/commsdatabaseshim/group/comms-infras_commdbshim.mrp"/>
+ </component>
+ </collection>
+ <collection id="datacommsserver" name="Data Comms Server" level="framework">
+ <component id="esockserver" name="ESock Server" purpose="mandatory">
+ <unit version="3" bldFile="datacommsserver/esockserver/group" mrp="datacommsserver/esockserver/group/comms-infras_esock.mrp"/>
+ </component>
+ <component id="esockserverconfig" name="ESock Server Config" introduced="9.1" purpose="mandatory" class="config" filter="test">
+ <unit version="3" mrp="datacommsserver/esockserver/group/comms-infras_esock-config.mrp" bldFile="datacommsserver/esockserver/etc"/>
+ </component>
+ <component id="networkingdialogapi" name="Networking Dialog API" introduced="6.1" purpose="optional">
+ <unit bldFile="datacommsserver/networkingdialogapi/group" mrp="datacommsserver/networkingdialogapi/group/networking_dialog.mrp"/>
+ </component>
+ <component id="networkingdialogstub" name="Networking Dialog Stub" introduced="6.1" purpose="optional">
+ <unit bldFile="datacommsserver/networkingdialogapi/default" mrp="datacommsserver/networkingdialogapi/default/networking_dialog_default.mrp"/>
+ </component>
+ <component id="networkcontroller" name="Network Controller" introduced="7.0s" purpose="optional" class="plugin">
+ <unit bldFile="datacommsserver/networkcontroller/group" mrp="datacommsserver/networkcontroller/group/networking_netcon.mrp"/>
+ </component>
+ </collection>
+ <collection id="serialserver" name="Serial Server" level="server">
+ <component id="serialportcsy" name="Serial Port CSY" introduced="ER5" purpose="optional" class="plugin">
+ <unit bldFile="serialserver/serialportcsy" mrp="serialserver/serialportcsy/ser-comms_serialportcsy.mrp"/>
+ </component>
+ <component id="packetloopbackcsy" name="Packet Loopback CSY" introduced="8.1" purpose="development">
+ <unit bldFile="serialserver/packetloopbackcsy/group" mrp="serialserver/packetloopbackcsy/group/PacketLoopbackCSY.mrp"/>
+ </component>
+ <component id="c32serialserver" name="C32 Serial Server" introduced="ER5" purpose="mandatory">
+ <unit bldFile="serialserver/c32serialserver/group" mrp="serialserver/c32serialserver/group/ser-comms_c32.mrp"/>
+ </component>
+ <component id="c32serialserverconfig" name="C32 Serial Server Config" introduced="ER5" purpose="mandatory" class="config">
+ <unit bldFile="serialserver/c32serialserverconfig" mrp="serialserver/c32serialserverconfig/ser-comms_c32-config.mrp"/>
+ </component>
+ <component id="c32serialserverdocs" name="C32 Serial Server Documentation" purpose="development" class="doc">
+ <unit mrp="serialserver/c32serialserverdocs/ser-comms_documentation.mrp"/>
+ </component>
+ </collection>
+ <collection id="commsfwutils" name="Comms Framework Utilities" level="framework">
+ <component id="commsbufs" name="Comms Buffers" introduced="^3" purpose="mandatory">
+ <unit bldFile="commsfwutils/commsbufs/group" mrp="commsfwutils/commsbufs/group/comms-infras_commsbufs.mrp"/>
+ </component>
+ </collection>
+ <collection id="commsfw_info" name="Comms Framework Info" level="app-if">
+ <component id="commsinfrastructuredocs" name="Comms Infrastructure Documentation" introduced="7.0" purpose="development" class="doc">
+ <unit mrp="commsfw_info/commsinfrastructuredocs/comms-infras_documentation.mrp"/>
+ </component>
+ <component id="commsfw_metadata" name="Communications Framework Metadata" class="config" introduced="^2" purpose="development" target="desktop">
+ <unit mrp="commsfw_info/commsfw_metadata/commsfw_metadata.mrp"/>
+ </component>
+ </collection>
+ <collection id="commsfwsupport" name="Comms Framework Support" level="support">
+ <component id="commselements" name="Comms Elements" introduced="8.0" purpose="mandatory">
+ <unit bldFile="commsfwsupport/commselements/group" mrp="commsfwsupport/commselements/group/comms-infras_elements.mrp"/>
+ </component>
+ </collection>
+ <collection id="commsinfrastructureapitest" name="Comms-Infras API Tests" level="app-if">
+ <component id="commsinfrastructuresvs" name="Comms Infrastructure Verification Suite" introduced="^3" purpose="development">
+ <unit mrp="commsinfrastructureapitest/commsinfrastructuresvs/group/commsinfrastructuresvs.mrp"/>
+ </component>
+ </collection>
+ <collection id="commsfwtools" name="Comms Framework Tools" level="app-if">
+ <component id="preparedefaultcommsdatabase" name="Prepare Default Comms Database" filter="gt" purpose="mandatory" class="config" target="desktop">
+ <unit bldFile="commsfwtools/preparedefaultcommsdatabase/defaultcommdb/group" mrp="commsfwtools/preparedefaultcommsdatabase/defaultcommdb/group/comms-infras_defaultcommdb.mrp"/>
+ </component>
+ <component id="installdefaultcommsdatabase" name="Install Default Comms Database" purpose="mandatory" target="desktop">
+ <unit bldFile="commsfwtools/preparedefaultcommsdatabase/installdefaultcommdb/group" mrp="commsfwtools/preparedefaultcommsdatabase/installdefaultcommdb/group/comms-infras_installdefaultcommdb.mrp" priority="1010"/>
+ </component>
+ <component id="commstools" name="Comms Tools" introduced="^3" purpose="development" target="desktop">
+ <unit bldFile="commsfwtools/commstools/group" mrp="commsfwtools/commstools/group/comms-infras_tools.mrp"/>
+ </component>
+ </collection>
+ </package>
+</SystemDefinition>
--- a/symbian3/os/deviceplatformrelease/foundation_system/system_model/system_definition.xml Fri Feb 12 16:37:22 2010 +0000
+++ b/symbian3/os/deviceplatformrelease/foundation_system/system_model/system_definition.xml Mon Feb 15 18:25:55 2010 +0000
@@ -141,13 +141,13 @@
<package id="legacypresence" level="specific" tech-domain="pr" href="../../../../mw/legacypresence/package_definition_3.0.xml"/>
<package id="opensrv" level="specific" tech-domain="pr" href="../../../../mw/opensrv/package_definition_3.0.xml"/>
<package id="remotemgmt" level="specific" tech-domain="dm" href="../../../../mw/remotemgmt/package_definition_3.0.xml"/>
- <package id="networkingdm" level="generic" tech-domain="dm" href="../../../../mw/networkingdm/package_definition_3.0.xml"/>
<package id="remotestorage" level="generic" tech-domain="de" href="../../../../mw/remotestorage/package_definition_3.0.xml"/>
<package id="remoteconn" level="generic" tech-domain="de" href="../../../../mw/remoteconn/package_definition_3.0.xml"/>
<package id="srvdiscovery" level="generic" tech-domain="de" href="../../../../mw/srvdiscovery/package_definition_3.0.xml"/>
<package id="dlnasrv" level="specific" tech-domain="de" href="../../../../mw/dlnasrv/package_definition_3.0.xml"/>
<package id="btservices" level="generic" tech-domain="de" href="../../../../mw/btservices/package_definition_3.0.xml"/>
<package id="usbservices" level="generic" tech-domain="de" href="../../../../mw/usbservices/package_definition_3.0.xml"/>
+ <package id="shortlinkconn" level="generic" tech-domain="de" href="../../../../mw/shortlinkconn/package_definition_3.0.xml"/>
<package id="imghandling" level="specific" tech-domain="mm" href="../../../../mw/imghandling/package_definition_3.0.xml"/>
<package id="metadatasrv" level="specific" tech-domain="mm" href="../../../../mw/metadatasrv/package_definition_3.0.xml"/>
<package id="mds" level="specific" tech-domain="mm" href="../../../../mw/mds/package_definition_3.0.xml"/>
--- a/symbian3/os/deviceplatformrelease/package_definition.xml Fri Feb 12 16:37:22 2010 +0000
+++ b/symbian3/os/deviceplatformrelease/package_definition.xml Mon Feb 15 18:25:55 2010 +0000
@@ -1,136 +1,183 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE SystemDefinition [
- <!ELEMENT SystemDefinition (systemModel?,SystemBuild?)>
- <!ATTLIST SystemDefinition
- name CDATA #REQUIRED
- schema CDATA #REQUIRED>
- <!ELEMENT systemModel (layer+)>
- <!ELEMENT layer (block*|collection*)*>
- <!ATTLIST layer
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED
- levels NMTOKENS #IMPLIED
- span CDATA #IMPLIED>
- <!ELEMENT block (subblock*|collection*)*>
- <!ATTLIST block
- levels NMTOKENS #IMPLIED
- span CDATA #IMPLIED
- level NMTOKEN #IMPLIED
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED>
- <!ELEMENT subblock (collection)*>
- <!ATTLIST subblock
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED>
- <!ELEMENT collection (component)*>
- <!ATTLIST collection
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED
- level NMTOKEN #IMPLIED>
- <!ELEMENT component (unit)*>
- <!ATTLIST component
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED
- deprecated CDATA #IMPLIED
- introduced CDATA #IMPLIED
- contract CDATA #IMPLIED
- plugin (Y|N) 'N'
- filter CDATA #IMPLIED
- class NMTOKENS #IMPLIED
- supports CDATA #IMPLIED
- purpose (optional|mandatory|development) 'optional'>
- <!ELEMENT unit EMPTY>
- <!ATTLIST unit
- mrp CDATA #IMPLIED
- filter CDATA #IMPLIED
- bldFile CDATA #IMPLIED
- root CDATA #IMPLIED
- version NMTOKEN #IMPLIED
- prebuilt NMTOKEN #IMPLIED
- late (Y|N) #IMPLIED
- priority CDATA #IMPLIED>
- <!ELEMENT SystemBuild (option*|target+|targetList+|list+|configuration+)*>
- <!ATTLIST SystemBuild schema CDATA #REQUIRED>
- <!ELEMENT list (ref+)>
- <!ATTLIST list
- name ID #REQUIRED
- description CDATA #REQUIRED>
- <!ELEMENT ref EMPTY>
- <!ATTLIST ref item CDATA #REQUIRED>
- <!ELEMENT targetList EMPTY>
- <!ATTLIST targetList
- name ID #REQUIRED
- description CDATA #REQUIRED
- target IDREFS #REQUIRED>
- <!ELEMENT target EMPTY>
- <!ATTLIST target
- name ID #REQUIRED
- abldTarget CDATA #REQUIRED
- description CDATA #REQUIRED>
- <!ELEMENT option EMPTY>
- <!ATTLIST option
- name ID #REQUIRED
- abldOption CDATA #REQUIRED
- description CDATA #REQUIRED
- enable (Y|N) #REQUIRED>
- <!ELEMENT configuration (listRef+|ref+|task+)*>
- <!ATTLIST configuration
- name ID #REQUIRED
- description CDATA #REQUIRED
- filter CDATA #REQUIRED>
- <!ELEMENT task (listRef*,(buildLayer|specialInstructions))>
- <!ELEMENT listRef EMPTY>
- <!ATTLIST listRef list CDATA #REQUIRED>
- <!ELEMENT buildLayer EMPTY>
- <!ATTLIST buildLayer
- command CDATA #REQUIRED
- targetList IDREFS #IMPLIED
- unitParallel (Y|N) #REQUIRED
- targetParallel (Y|N) 'N'>
- <!ELEMENT specialInstructions EMPTY>
- <!ATTLIST specialInstructions
- name CDATA #REQUIRED
- cwd CDATA #REQUIRED
- root CDATA #IMPLIED
- command CDATA #REQUIRED>
-]>
-<SystemDefinition schema="2.0.1" name="Symbian^3">
-<systemModel>
-<layer name="os" long-name="OS" levels="hw services">
-<block name="deviceplatformrelease" level="services" long-name="Device Platform Release" levels="bld mid top">
-<collection name="symbianosbld" long-name="Symbian OS Build" level="bld">
-<component name="cedarutils" long-name="Cedar Utils" purpose="development">
-<unit mrp="/sf/os/deviceplatformrelease/symbianosbld/cedarutils/tools_utils_cedar.mrp"/>
-</component>
-<component name="productionbldcbrconfig" long-name="Production Build CBR Config" filter="gt" purpose="development" class="config">
-<unit mrp="/sf/os/deviceplatformrelease/symbianosbld/productionbldcbrconfig/product_cbr_config.mrp"/>
-</component>
-</collection>
-<collection name="foundation_system" long-name="Foundation System" level="top">
-<component name="systemdocs" long-name="System Documentation" purpose="development" class="doc">
-<unit mrp="/sf/os/deviceplatformrelease/foundation_system/systemdocs/group/system.mrp"/>
-</component>
-<component name="system_model" long-name="System Model" introduced="tb91" purpose="development" class="config PC">
-<unit mrp="/sf/os/deviceplatformrelease/foundation_system/system_model/system_model.mrp"/>
-</component>
-</collection>
-<collection name="deviceplatformrelease_info" long-name="Device Platform Release Info" level="top">
-<component name="deviceplatformrelease_metadata" long-name="Device Platform Release Metadata" introduced="tb91" purpose="development" class="config PC">
-<unit mrp="/sf/os/deviceplatformrelease/deviceplatformrelease_info/deviceplatformrelease_metadata/deviceplatformrelease_metadata.mrp"/>
-</component>
-</collection>
-<collection name="s60">
-<component name="S60Extras">
-<unit bldFile="/sf/os/deviceplatformrelease/S60Extras/group" mrp=""/>
-</component>
-<component name="S60LocFiles">
-<unit bldFile="/sf/os/deviceplatformrelease/S60LocFiles/group" mrp=""/>
-</component>
-<component name="version">
-<unit bldFile="/sf/os/deviceplatformrelease/Version/group" mrp=""/>
-</component>
-</collection>
-</block>
-</layer>
-</systemModel>
-</SystemDefinition>
\ No newline at end of file
+<!DOCTYPE SystemDefinition [
+<!ELEMENT SystemDefinition ( systemModel )>
+<!ATTLIST SystemDefinition
+ name CDATA #REQUIRED
+ schema CDATA #REQUIRED
+>
+<!-- all paths are relative to the environment variable specified by the root attribute, or SOURCEROOT if not. -->
+
+<!-- System Model Section of DTD -->
+<!ELEMENT systemModel (layer+)>
+
+<!ELEMENT layer (block* | collection*)*>
+<!-- Kernel Services, Base Services, OS Services, Etc -->
+<!ATTLIST layer
+ name CDATA #REQUIRED
+ long-name CDATA #IMPLIED
+ levels NMTOKENS #IMPLIED
+ span CDATA #IMPLIED
+>
+
+<!ELEMENT block (subblock* | collection*)*>
+ <!-- Generic OS services, Comms Services, etc -->
+<!ATTLIST block
+ levels NMTOKENS #IMPLIED
+ span CDATA #IMPLIED
+ level NMTOKEN #IMPLIED
+ name CDATA #REQUIRED
+ long-name CDATA #IMPLIED
+>
+
+<!ELEMENT subblock (collection)*>
+<!-- Cellular Baseband Services, Networking Services, etc -->
+<!ATTLIST subblock
+ name CDATA #REQUIRED
+ long-name CDATA #IMPLIED
+>
+
+<!ELEMENT collection (component)*>
+<!-- Screen Driver, Content Handling, etc -->
+<!ATTLIST collection
+ name CDATA #REQUIRED
+ long-name CDATA #IMPLIED
+ level NMTOKEN #IMPLIED
+>
+
+<!ELEMENT component (unit)*>
+<!-- contains units or is a package or prebuilt -->
+<!ATTLIST component
+ name CDATA #REQUIRED
+ long-name CDATA #IMPLIED
+ deprecated CDATA #IMPLIED
+ introduced CDATA #IMPLIED
+ contract CDATA #IMPLIED
+ plugin (Y|N) "N"
+ filter CDATA #IMPLIED
+ class NMTOKENS #IMPLIED
+ supports CDATA #IMPLIED
+ purpose ( optional | mandatory | development ) "optional"
+>
+
+<!ELEMENT unit EMPTY >
+<!-- must be buildable (bld.inf) -->
+<!-- bldFile may someday be removed in favour of mrp -->
+<!ATTLIST unit
+ mrp CDATA #IMPLIED
+ filter CDATA #IMPLIED
+ bldFile CDATA #IMPLIED
+ root CDATA #IMPLIED
+ version NMTOKEN #IMPLIED
+ prebuilt NMTOKEN #IMPLIED
+ late (Y|N) #IMPLIED
+ priority CDATA #IMPLIED
+>
+]>
+<SystemDefinition name="Symbian^3" schema="2.0.1">
+ <systemModel>
+ <layer name="os" long-name="OS" levels="hw services">
+ <block name="deviceplatformrelease" level="services" long-name="Device Platform Release" levels="bld mid top">
+ <collection name="s60extras" long-name="S60 Extras" level="mid">
+ <!-- collection is really a component. Need to move down a directory -->
+ <component name="s60extras_build" filter="s60" long-name="S60 Extras Build" purpose="development" class="config">
+ <unit bldFile="/sf/os/deviceplatformrelease/s60extras/group"/>
+ </component>
+ </collection>
+ <collection name="locfiles" long-name="Locale Files" level="mid">
+ <component name="locfiles_build" filter="s60" long-name="S60 Locale Files Build" purpose="development" class="config">
+ <!-- need to move component down a directory -->
+ <unit bldFile="/sf/os/deviceplatformrelease/s60locfiles/group"/>
+ </component>
+ <component name="locfiles_set1" long-name="Locale Files Set 1" filter="s60" class="config">
+ <unit bldFile="/sf/os/deviceplatformrelease/locfiles/group/set1"/>
+ </component>
+ <component name="locfiles_set2" long-name="Locale Files Set 2" filter="s60" class="config">
+ <unit bldFile="/sf/os/deviceplatformrelease/locfiles/group/set2"/>
+ </component>
+ <component name="locfiles_set3" long-name="Locale Files Set 3" filter="s60" class="config">
+ <unit bldFile="/sf/os/deviceplatformrelease/locfiles/group/set3"/>
+ </component>
+ <component name="locfiles_set4" long-name="Locale Files Set 4" filter="s60" class="config">
+ <unit bldFile="/sf/os/deviceplatformrelease/locfiles/group/set4"/>
+ </component>
+ <component name="locfiles_set5" long-name="Locale Files Set 5" filter="s60" class="config">
+ <unit bldFile="/sf/os/deviceplatformrelease/locfiles/group/set5"/>
+ </component>
+ <component name="locfiles_set6" long-name="Locale Files Set 6" filter="s60" class="config">
+ <unit bldFile="/sf/os/deviceplatformrelease/locfiles/group/set6"/>
+ </component>
+ <!-- is the a problem with SF builds with the following? -->
+ <component name="locfiles_set7" long-name="Locale Files Set 7" filter="s60" class="config">
+ <unit bldFile="/sf/os/deviceplatformrelease/locfiles/group/set7"/>
+ </component>
+ <component name="locfiles_set8" long-name="Locale Files Set 8" filter="s60" class="config">
+ <unit bldFile="/sf/os/deviceplatformrelease/locfiles/group/set8"/>
+ </component>
+ <component name="locfiles_set9" long-name="Locale Files Set 9" filter="s60" class="config">
+ <unit bldFile="/sf/os/deviceplatformrelease/locfiles/group/set9"/>
+ </component>
+ <component name="locfiles_set10" long-name="Locale Files Set 10" filter="s60" class="config">
+ <unit bldFile="/sf/os/deviceplatformrelease/locfiles/group/set10"/>
+ </component>
+ <component name="locfiles_set11" long-name="Locale Files Set 11" filter="s60" class="config">
+ <unit bldFile="/sf/os/deviceplatformrelease/locfiles/group/set11"/>
+ </component>
+ <component name="locfiles_set12" long-name="Locale Files Set 12" filter="s60" class="config">
+ <unit bldFile="/sf/os/deviceplatformrelease/locfiles/group/set12"/>
+ </component>
+ <component name="locfiles_set13" long-name="Locale Files Set 13" filter="s60" class="config">
+ <unit bldFile="/sf/os/deviceplatformrelease/locfiles/group/set13"/>
+ </component>
+ <component name="locfiles_set14" long-name="Locale Files Set 14" filter="s60" class="config">
+ <unit bldFile="/sf/os/deviceplatformrelease/locfiles/group/set14"/>
+ </component>
+ <component name="locfiles_set15" long-name="Locale Files Set 15" filter="s60" class="config">
+ <unit bldFile="/sf/os/deviceplatformrelease/locfiles/group/set15"/>
+ </component>
+ <component name="locfiles_set16" long-name="Locale Files Set 16" filter="s60" class="config">
+ <unit bldFile="/sf/os/deviceplatformrelease/locfiles/group/set16"/>
+ </component>
+ </collection>
+ <collection name="version" long-name="Version" level="top">
+ <!-- collection is really a component. Need to move down a directory -->
+ <component name="version_build" filter="s60" long-name="Version Build" purpose="development" class="config">
+ <unit bldFile="/sf/os/deviceplatformrelease/version/group"/>
+ </component>
+ </collection>
+ <collection name="helps_loc2" long-name="Helps Locale 2" level="top">
+ <!-- collection is really a component. Need to move down a directory -->
+ <component name="helps_loc2_build" long-name="Helps Locale 2 Build" filter="s60">
+ <unit bldFile="/sf/os/deviceplatformrelease/helps_loc2/group"/>
+ </component>
+ </collection>
+ <collection name="sf_config" long-name="SF Config" level="mid">
+ <component name="config" filter="s60" long-name="Config" purpose="development" class="config"/>
+ </collection>
+ <!-- should be located locally in buildplatforms/group
+ <collection id="s60bld" name="S60 Build">
+ <component id="buildplatforms" filter="s60" name="Build Platforms">
+ <unit bldFile="/tools/buildplatforms/group"/>
+ </component>
+ </collection>-->
+ <collection name="symbianosbld" long-name="Symbian OS Build" level="bld">
+ <component name="cedarutils" long-name="Cedar Utils" purpose="development">
+ <unit mrp="/sf/os/deviceplatformrelease/symbianosbld/cedarutils/tools_utils_cedar.mrp"/>
+ </component>
+ <component name="productionbldcbrconfig" long-name="Production Build CBR Config" filter="gt" purpose="development" class="config">
+ <unit mrp="/sf/os/deviceplatformrelease/symbianosbld/productionbldcbrconfig/product_cbr_config.mrp"/>
+ </component>
+ </collection>
+ <collection name="foundation_system" long-name="Foundation System" level="top">
+ <component name="system_model" long-name="System Model" introduced="^2" purpose="development" class="config PC">
+ <unit mrp="/sf/os/deviceplatformrelease/foundation_system/system_model/system_model.mrp"/>
+ </component>
+ </collection>
+ <collection name="deviceplatformrelease_info" long-name="Device Platform Release Info" level="top">
+ <component name="deviceplatformrelease_metadata" long-name="Device Platform Release Metadata" introduced="^2" purpose="development" class="config PC">
+ <unit mrp="/sf/os/deviceplatformrelease/deviceplatformrelease_info/deviceplatformrelease_metadata/deviceplatformrelease_metadata.mrp"/>
+ </component>
+ </collection>
+ </block>
+ </layer>
+ </systemModel>
+</SystemDefinition>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/symbian3/os/deviceplatformrelease/package_definition_3.0.xml Mon Feb 15 18:25:55 2010 +0000
@@ -0,0 +1,109 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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="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 bldFile="locfiles/group/set1"/>
+ </component>
+ <component id="locfiles_set2" name="Locale Files Set 2" class="config" filter="s60">
+ <unit bldFile="locfiles/group/set2"/>
+ </component>
+ <component id="locfiles_set3" name="Locale Files Set 3" class="config" filter="s60">
+ <unit bldFile="locfiles/group/set3"/>
+ </component>
+ <component id="locfiles_set4" name="Locale Files Set 4" class="config" filter="s60">
+ <unit bldFile="locfiles/group/set4"/>
+ </component>
+ <component id="locfiles_set5" name="Locale Files Set 5" class="config" filter="s60">
+ <unit bldFile="locfiles/group/set5"/>
+ </component>
+ <component id="locfiles_set6" name="Locale Files Set 6" class="config" filter="s60">
+ <unit 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 bldFile="locfiles/group/set7"/>
+ </component>
+ <component id="locfiles_set8" name="Locale Files Set 8" class="config" filter="s60">
+ <unit bldFile="locfiles/group/set8"/>
+ </component>
+ <component id="locfiles_set9" name="Locale Files Set 9" class="config" filter="s60">
+ <unit bldFile="locfiles/group/set9"/>
+ </component>
+ <component id="locfiles_set10" name="Locale Files Set 10" class="config" filter="s60">
+ <unit bldFile="locfiles/group/set10"/>
+ </component>
+ <component id="locfiles_set11" name="Locale Files Set 11" class="config" filter="s60">
+ <unit bldFile="locfiles/group/set11"/>
+ </component>
+ <component id="locfiles_set12" name="Locale Files Set 12" class="config" filter="s60">
+ <unit bldFile="locfiles/group/set12"/>
+ </component>
+ <component id="locfiles_set13" name="Locale Files Set 13" class="config" filter="s60">
+ <unit bldFile="locfiles/group/set13"/>
+ </component>
+ <component id="locfiles_set14" name="Locale Files Set 14" class="config" filter="s60">
+ <unit bldFile="locfiles/group/set14"/>
+ </component>
+ <component id="locfiles_set15" name="Locale Files Set 15" class="config" filter="s60">
+ <unit bldFile="locfiles/group/set15"/>
+ </component>
+ <component id="locfiles_set16" name="Locale Files Set 16" class="config" filter="s60">
+ <unit 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">
+ <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">
+ <unit bldFile="/tools/buildplatforms/group"/>
+ </component>
+ </collection>-->
+ <collection id="symbianosbld" name="Symbian OS Build" level="bld">
+ <component id="cedarutils" name="Cedar Utils" purpose="development">
+ <unit mrp="symbianosbld/cedarutils/tools_utils_cedar.mrp"/>
+ </component>
+ <component id="productionbldcbrconfig" name="Production Build CBR Config" filter="gt" purpose="development" class="config">
+ <unit mrp="symbianosbld/productionbldcbrconfig/product_cbr_config.mrp"/>
+ </component>
+ </collection>
+ <collection id="foundation_system" name="Foundation System" level="top">
+ <component id="system_model" name="System Model" class="config" introduced="^2" purpose="development" target="desktop">
+ <unit mrp="foundation_system/system_model/system_model.mrp"/>
+ </component>
+ </collection>
+ <collection id="deviceplatformrelease_info" name="Device Platform Release Info" level="top">
+ <component id="deviceplatformrelease_metadata" name="Device Platform Release Metadata" class="config" introduced="^2" purpose="development" target="desktop">
+ <unit mrp="deviceplatformrelease_info/deviceplatformrelease_metadata/deviceplatformrelease_metadata.mrp"/>
+ </component>
+ </collection>
+ </package>
+</SystemDefinition>
--- a/symbian3/os/devicesrv/package_definition.xml Fri Feb 12 16:37:22 2010 +0000
+++ b/symbian3/os/devicesrv/package_definition.xml Mon Feb 15 18:25:55 2010 +0000
@@ -1,171 +1,285 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE SystemDefinition [
- <!ELEMENT SystemDefinition (systemModel?,SystemBuild?)>
- <!ATTLIST SystemDefinition
- name CDATA #REQUIRED
- schema CDATA #REQUIRED>
- <!ELEMENT systemModel (layer+)>
- <!ELEMENT layer (block*|collection*)*>
- <!ATTLIST layer
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED
- levels NMTOKENS #IMPLIED
- span CDATA #IMPLIED>
- <!ELEMENT block (subblock*|collection*)*>
- <!ATTLIST block
- levels NMTOKENS #IMPLIED
- span CDATA #IMPLIED
- level NMTOKEN #IMPLIED
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED>
- <!ELEMENT subblock (collection)*>
- <!ATTLIST subblock
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED>
- <!ELEMENT collection (component)*>
- <!ATTLIST collection
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED
- level NMTOKEN #IMPLIED>
- <!ELEMENT component (unit)*>
- <!ATTLIST component
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED
- deprecated CDATA #IMPLIED
- introduced CDATA #IMPLIED
- contract CDATA #IMPLIED
- plugin (Y|N) 'N'
- filter CDATA #IMPLIED
- class NMTOKENS #IMPLIED
- supports CDATA #IMPLIED
- purpose (optional|mandatory|development) 'optional'>
- <!ELEMENT unit EMPTY>
- <!ATTLIST unit
- mrp CDATA #IMPLIED
- filter CDATA #IMPLIED
- bldFile CDATA #IMPLIED
- root CDATA #IMPLIED
- version NMTOKEN #IMPLIED
- prebuilt NMTOKEN #IMPLIED
- late (Y|N) #IMPLIED
- priority CDATA #IMPLIED>
- <!ELEMENT SystemBuild (option*|target+|targetList+|list+|configuration+)*>
- <!ATTLIST SystemBuild schema CDATA #REQUIRED>
- <!ELEMENT list (ref+)>
- <!ATTLIST list
- name ID #REQUIRED
- description CDATA #REQUIRED>
- <!ELEMENT ref EMPTY>
- <!ATTLIST ref item CDATA #REQUIRED>
- <!ELEMENT targetList EMPTY>
- <!ATTLIST targetList
- name ID #REQUIRED
- description CDATA #REQUIRED
- target IDREFS #REQUIRED>
- <!ELEMENT target EMPTY>
- <!ATTLIST target
- name ID #REQUIRED
- abldTarget CDATA #REQUIRED
- description CDATA #REQUIRED>
- <!ELEMENT option EMPTY>
- <!ATTLIST option
- name ID #REQUIRED
- abldOption CDATA #REQUIRED
- description CDATA #REQUIRED
- enable (Y|N) #REQUIRED>
- <!ELEMENT configuration (listRef+|ref+|task+)*>
- <!ATTLIST configuration
- name ID #REQUIRED
- description CDATA #REQUIRED
- filter CDATA #REQUIRED>
- <!ELEMENT task (listRef*,(buildLayer|specialInstructions))>
- <!ELEMENT listRef EMPTY>
- <!ATTLIST listRef list CDATA #REQUIRED>
- <!ELEMENT buildLayer EMPTY>
- <!ATTLIST buildLayer
- command CDATA #REQUIRED
- targetList IDREFS #IMPLIED
- unitParallel (Y|N) #REQUIRED
- targetParallel (Y|N) 'N'>
- <!ELEMENT specialInstructions EMPTY>
- <!ATTLIST specialInstructions
- name CDATA #REQUIRED
- cwd CDATA #REQUIRED
- root CDATA #IMPLIED
- command CDATA #REQUIRED>
-]>
-<SystemDefinition schema="2.0.1" name="Symbian^3">
-<systemModel>
-<layer name="os" long-name="OS" levels="hw services">
-<block name="devicesrv" level="services" long-name="Device Services" levels="adaptation hw-if plugin framework server app-if">
-<collection name="accessoryservices" long-name="Accessory Services" level="framework">
-<component name="remotecontrolfw" long-name="Remote Control Framework" introduced="9.1" purpose="optional">
-<unit bldFile="/sf/os/devicesrv/accessoryservices/remotecontrolfw/group" mrp="/sf/os/devicesrv/accessoryservices/remotecontrolfw/group/bluetooth_remotecontrol.mrp"/>
-</component>
-</collection>
-<!-- MattD 20091030 - hacked in from package definition. Presume these should be in the GT model... -->
- <collection name="commonservices" long-name="Common Services" level="app-if">
- <component name="sysutil" long-name="System Utilities" purpose="mandatory" introduced="ER5">
- <unit bldFile="/sf/os/devicesrv/commonservices/sysutil/group" mrp="/sf/os/devicesrv/commonservices/sysutil/group/sysutil.mrp"/>
- </component>
+<!DOCTYPE SystemDefinition [
+<!ELEMENT SystemDefinition ( systemModel )>
+<!ATTLIST SystemDefinition
+ name CDATA #REQUIRED
+ schema CDATA #REQUIRED
+>
+<!-- all paths are relative to the environment variable specified by the root attribute, or SOURCEROOT if not. -->
+
+<!-- System Model Section of DTD -->
+<!ELEMENT systemModel (layer+)>
+
+<!ELEMENT layer (block* | collection*)*>
+<!-- Kernel Services, Base Services, OS Services, Etc -->
+<!ATTLIST layer
+ name CDATA #REQUIRED
+ long-name CDATA #IMPLIED
+ levels NMTOKENS #IMPLIED
+ span CDATA #IMPLIED
+>
+
+<!ELEMENT block (subblock* | collection*)*>
+ <!-- Generic OS services, Comms Services, etc -->
+<!ATTLIST block
+ levels NMTOKENS #IMPLIED
+ span CDATA #IMPLIED
+ level NMTOKEN #IMPLIED
+ name CDATA #REQUIRED
+ long-name CDATA #IMPLIED
+>
+
+<!ELEMENT subblock (collection)*>
+<!-- Cellular Baseband Services, Networking Services, etc -->
+<!ATTLIST subblock
+ name CDATA #REQUIRED
+ long-name CDATA #IMPLIED
+>
+
+<!ELEMENT collection (component)*>
+<!-- Screen Driver, Content Handling, etc -->
+<!ATTLIST collection
+ name CDATA #REQUIRED
+ long-name CDATA #IMPLIED
+ level NMTOKEN #IMPLIED
+>
+
+<!ELEMENT component (unit)*>
+<!-- contains units or is a package or prebuilt -->
+<!ATTLIST component
+ name CDATA #REQUIRED
+ long-name CDATA #IMPLIED
+ deprecated CDATA #IMPLIED
+ introduced CDATA #IMPLIED
+ contract CDATA #IMPLIED
+ plugin (Y|N) "N"
+ filter CDATA #IMPLIED
+ class NMTOKENS #IMPLIED
+ supports CDATA #IMPLIED
+ purpose ( optional | mandatory | development ) "optional"
+>
+
+<!ELEMENT unit EMPTY >
+<!-- must be buildable (bld.inf) -->
+<!-- bldFile may someday be removed in favour of mrp -->
+<!ATTLIST unit
+ mrp CDATA #IMPLIED
+ filter CDATA #IMPLIED
+ bldFile CDATA #IMPLIED
+ root CDATA #IMPLIED
+ version NMTOKEN #IMPLIED
+ prebuilt NMTOKEN #IMPLIED
+ late (Y|N) #IMPLIED
+ priority CDATA #IMPLIED
+>
+]>
+<SystemDefinition name="Symbian^3" schema="2.0.1">
+ <systemModel>
+ <layer name="os" long-name="OS" levels="hw services">
+ <block name="devicesrv" level="services" long-name="Device Services" levels="adaptation hw-if plugin framework server app-if">
+ <collection name="accessoryservices" long-name="Accessory Services" level="framework">
+ <component name="accessorymonitor" filter="s60" long-name="Accessory Monitor">
+ <unit bldFile="/sf/os/devicesrv/accessoryservices/accessorymonitor/group"/>
+ </component>
+ <component name="accessoryremotecontrol" filter="s60" long-name="Accessory Remote Control">
+ <unit bldFile="/sf/os/devicesrv/accessoryservices/accessoryremotecontrol/group"/>
+ </component>
+ <component name="accessoryserver" filter="s60" long-name="Accessory Server">
+ <unit bldFile="/sf/os/devicesrv/accessoryservices/accessoryserver/group"/>
+ </component>
+ <component name="pluggeddisplay" filter="s60" long-name="Plugged Display" introduced="^3">
+ <unit bldFile="/sf/os/devicesrv/accessoryservices/pluggeddisplay/group"/>
+ </component>
+ <component name="headsetstatusapi" filter="s60" long-name="Headset Status API">
+ <unit bldFile="/sf/os/devicesrv/accessoryservices/headsetstatusapi/group"/>
+ </component>
+ <component name="tspclientmapper" filter="s60" long-name="TSP Client Mapper">
+ <unit bldFile="/sf/os/devicesrv/accessoryservices/tspclientmapper/group"/>
+ </component>
+ <component name="remotecontrolfw" long-name="Remote Control Framework" introduced="9.1" purpose="optional">
+ <unit bldFile="/sf/os/devicesrv/accessoryservices/remotecontrolfw/group" mrp="/sf/os/devicesrv/accessoryservices/remotecontrolfw/group/bluetooth_remotecontrol.mrp"/>
+ </component>
+ <component name="gid_pc_tool" filter="s60" long-name="Generic ID PC Tool" class="tool PC">
+ <unit bldFile="/sf/os/devicesrv/accessoryservices/gid_pc_tool/group"/>
+ </component>
+ </collection>
+ <collection name="commonservices" long-name="Common Services" level="app-if">
+ <component name="commonengine" filter="s60" long-name="Common Engine">
+ <unit bldFile="/sf/os/devicesrv/commonservices/commonengine/group"/>
+ </component>
+ <component name="commonengineresources" filter="s60" long-name="Common Engine Resources" class="config">
+ <unit bldFile="/sf/os/devicesrv/commonservices/commonengineresources/group"/>
+ </component>
+ <component name="platformenv" filter="s60" long-name="Platform Environment">
+ <unit bldFile="/sf/os/devicesrv/commonservices/platformenv/group"/>
+ </component>
+ <component name="sysutil" long-name="System Utilities" purpose="mandatory" introduced="ER5">
+ <unit bldFile="/sf/os/devicesrv/commonservices/sysutil/group" mrp="/sf/os/devicesrv/commonservices/sysutil/group/sysutil.mrp"/>
+ </component>
<component name="activitymanager" long-name="Activity Manager" purpose="mandatory" introduced="ER5">
- <unit bldFile="/sf/os/devicesrv/commonservices/activitymanager/group" mrp="/sf/os/devicesrv/commonservices\activitymanager\group\activitymanager.mrp"/>
- </component>
- </collection>
-<collection name="resourcemgmt" long-name="Resource Management" level="hw-if">
-<component name="hwresourcesmgr" long-name="Hardware Resources Manager" introduced="tb91" purpose="optional">
-<unit bldFile="/sf/os/devicesrv/resourcemgmt/hwresourcesmgr/group" mrp="/sf/os/devicesrv/resourcemgmt/hwresourcesmgr/group/telephony_hwrm.mrp"/>
-</component>
-<component name="hwresourcesmgrconfig" long-name="Hardware Resources Manager Config" introduced="tb92" purpose="optional" class="config">
-<unit bldFile="/sf/os/devicesrv/resourcemgmt/hwresourcesmgrconfig" mrp="/sf/os/devicesrv/resourcemgmt/hwresourcesmgrconfig/telephony_hwrm-config.mrp"/>
-</component>
-<component name="powerandmemorynotificationservice" long-name="Power and Memory Notification Service" introduced="6.0" purpose="mandatory">
-<unit bldFile="/sf/os/devicesrv/resourcemgmt/powerandmemorynotificationservice/group" mrp="/sf/os/devicesrv/resourcemgmt/powerandmemorynotificationservice/group/syslibs_pwrcli.mrp"/>
-</component>
-</collection>
-<collection name="sysstatemgmt" long-name="System State Management" level="server">
-<component name="systemstarter" long-name="System Starter" introduced="9.1" deprecated="tb92" purpose="mandatory">
-<unit bldFile="/sf/os/devicesrv/sysstatemgmt/systemstarter/group" mrp="/sf/os/devicesrv/sysstatemgmt/systemstarter/group/app-framework_sysstart.mrp"/>
-</component>
-<component name="systemstatemgr" long-name="System State Manager" introduced="tb92" purpose="mandatory">
-<unit bldFile="/sf/os/devicesrv/sysstatemgmt/systemstatemgr/group" mrp="/sf/os/devicesrv/sysstatemgmt/systemstatemgr/group/app-framework_ssma.mrp"/>
-</component>
-<component name="systemstateplugins" long-name="System State Plugins" introduced="tb92" purpose="optional" plugin="Y">
-<unit bldFile="/sf/os/devicesrv/sysstatemgmt/systemstateplugins/group" mrp="/sf/os/devicesrv/sysstatemgmt/systemstateplugins/group/app-framework_ssplugins.mrp"/>
-</component>
-<component name="systemstatereferenceplugins" long-name="System State Reference Plugins" introduced="tb92" purpose="optional" plugin="Y">
-<unit bldFile="/sf/os/devicesrv/sysstatemgmt/systemstatereferenceplugins/group" mrp="/sf/os/devicesrv/sysstatemgmt/systemstatereferenceplugins/group/app-framework_ssrefplugins.mrp"/>
-</component>
-</collection>
-<collection name="resourceinterfaces" long-name="Resource Interfaces" level="hw-if">
-<component name="fmtransmittercontrol" long-name="FM Transmitter Control" introduced="tb92" purpose="optional">
-<unit bldFile="/sf/os/devicesrv/resourceinterfaces/fmtransmittercontrol/group" mrp="/sf/os/devicesrv/resourceinterfaces/fmtransmittercontrol/group/telephony_hwrmfmtx.mrp"/>
-</component>
-</collection>
-<collection name="systemhealthmanagement" long-name="System Health Management" level="server">
-<component name="systemhealthmgr" long-name="System Health Manager" introduced="tb92" purpose="optional">
-<unit bldFile="/sf/os/devicesrv/systemhealthmanagement/systemhealthmgr/group" mrp="/sf/os/devicesrv/systemhealthmanagement/systemhealthmgr/group/app-framework_shma.mrp"/>
-</component>
-</collection>
-<collection name="devicesrvapitest" long-name="Devices Services API Tests" level="app-if">
-<component name="accessorieshaitest" long-name="Accessories HAI Tests" introduced="tb91" purpose="development">
-<unit mrp="/sf/os/devicesrv/devicesrvapitest/accessorieshaitest/group/accessorieshaitest.mrp"/>
-</component>
-<component name="hwrmhaitest" long-name="HWRM HAI Tests" introduced="tb91" purpose="development">
-<unit mrp="/sf/os/devicesrv/devicesrvapitest/hwrmhaitest/group/hwrmhaitest.mrp"/>
-</component>
-</collection>
-<collection name="devicesrv_info" long-name="Device Services Info" level="app-if">
-<component name="devicesrv_metadata" long-name="Device Services Metadata" introduced="tb91" purpose="development" class="config PC">
-<unit mrp="/sf/os/devicesrv/devicesrv_info/devicesrv_metadata/devicesrv_metadata.mrp"/>
-</component>
-</collection>
-<collection name="s60">
-<component name="devicesrv">
-<unit bldFile="/sf/os/devicesrv/group" mrp=""/>
-</component>
-</collection>
-</block>
-</layer>
-</systemModel>
-</SystemDefinition>
\ No newline at end of file
+ <unit bldFile="/sf/os/devicesrv/commonservices/activitymanager/group" mrp="/sf/os/devicesrv/commonservices/activitymanager/group/activitymanager.mrp"/>
+ </component>
+ </collection>
+ <collection name="dosservices" long-name="Domestic Operating System Services" level="hw-if">
+ <component name="commondsy" filter="s60" long-name="Common DSY" plugin="Y">
+ <unit bldFile="/sf/os/devicesrv/dosservices/commondsy/group"/>
+ </component>
+ <component name="dosserver" filter="s60" long-name="Domestic OS Server">
+ <unit bldFile="/sf/os/devicesrv/dosservices/dosserver/group"/>
+ </component>
+ </collection>
+ <collection name="sensorservices" long-name="Sensor Services" level="framework">
+ <component name="sensorserver" filter="s60" long-name="Sensor Server">
+ <unit bldFile="/sf/os/devicesrv/sensorservices/sensorserver/group"/>
+ </component>
+ <component name="orientationssy" filter="s60" long-name="Orientation SSY" plugin="Y">
+ <unit bldFile="/sf/os/devicesrv/sensorservices/orientationssy/group"/>
+ </component>
+ <component name="tiltcompensationssy" filter="s60" long-name="Tilt Compensation SSY" plugin="Y">
+ <unit bldFile="/sf/os/devicesrv/sensorservices/tiltcompensationssy/group"/>
+ </component>
+ <component name="sensordatacompensator" filter="s60" long-name="Sensor Data Compensator">
+ <unit bldFile="/sf/os/devicesrv/sensorservices/sensordatacompensator/group"/>
+ </component>
+ </collection>
+ <collection name="hwrmhaptics" long-name="HWRM Haptics" level="plugin">
+ <component name="hapticseffectdatagetterfw" filter="s60" long-name="Haptics Effect Data Getter Framework">
+ <unit bldFile="/sf/os/devicesrv/hwrmhaptics/hapticseffectdatagetterfw/group"/>
+ </component>
+ <component name="hapticspluginservice" filter="s60" long-name="Haptics Plugin Service">
+ <unit bldFile="/sf/os/devicesrv/hwrmhaptics/hapticspluginservice/group"/>
+ </component>
+ <component name="hapticspacketizer" filter="s60" long-name="Haptics Packetizer">
+ <unit bldFile="/sf/os/devicesrv/hwrmhaptics/hapticspacketizer/group"/>
+ </component>
+ <component name="hapticspluginmanager" filter="s60" long-name="Haptics Plugin Manager">
+ <unit bldFile="/sf/os/devicesrv/hwrmhaptics/hapticspluginmanager/group"/>
+ </component>
+ <component name="hapticsserver" filter="s60" long-name="Haptics Server">
+ <unit bldFile="/sf/os/devicesrv/hwrmhaptics/hapticsserver/group"/>
+ </component>
+ <component name="hapticsclient" filter="s60" long-name="Haptics Client">
+ <unit bldFile="/sf/os/devicesrv/hwrmhaptics/hapticsclient/group"/>
+ </component>
+ <component name="hwrmhaptics_build" filter="s60" long-name="HWRM Haptics Build">
+ <!-- move these exports into the appropriate above components and delete this component-->
+ <unit bldFile="/sf/os/devicesrv/hwrmhaptics/group"/>
+ </component>
+ </collection>
+ <collection name="mediator" long-name="Mediator" level="app-if">
+ <!--collection is really a component. Move it down a directory -->
+ <component name="mediator_build" filter="s60" long-name="Mediator Build">
+ <unit bldFile="/sf/os/devicesrv/mediator/group"/>
+ </component>
+ </collection>
+ <collection name="psmservices" long-name="Power Save Mode Services" level="app-if">
+ <component name="psmserver" filter="s60" long-name="PSM Server">
+ <unit bldFile="/sf/os/devicesrv/psmservices/psmserver/group"/>
+ </component>
+ </collection>
+ <collection name="resourcemgmt" long-name="Resource Management" level="hw-if">
+ <component name="hwrmfmtxwatcherplugin" filter="s60" long-name="HWRM FM Transmitter Watcher Plugin" plugin="Y">
+ <unit bldFile="/sf/os/devicesrv/resourcemgmt/hwrmfmtxwatcherplugin/group"/>
+ </component>
+ <component name="hwrmtargetmodifierplugin" filter="s60" long-name="HWRM Target Modifier Plugin" plugin="Y">
+ <!-- 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 name="vibractrl" filter="s60" long-name="Vibra Control" deprecated="9.1">
+ <unit bldFile="/sf/os/devicesrv/resourcemgmt/vibractrl/group"/>
+ </component>
+ <component name="hwresourcesmgr" long-name="Hardware Resources Manager" introduced="^2" purpose="optional">
+ <unit bldFile="/sf/os/devicesrv/resourcemgmt/hwresourcesmgr/group" mrp="/sf/os/devicesrv/resourcemgmt/hwresourcesmgr/group/telephony_hwrm.mrp"/>
+ </component>
+ <component name="hwresourcesmgrconfig" long-name="Hardware Resources Manager Config" introduced="^3" purpose="optional" class="config">
+ <unit bldFile="/sf/os/devicesrv/resourcemgmt/hwresourcesmgrconfig" mrp="/sf/os/devicesrv/resourcemgmt/hwresourcesmgrconfig/telephony_hwrm-config.mrp"/>
+ </component>
+ <component name="resourcemgmt_build" filter="s60" long-name="Resource Management Build">
+ <!-- Move exports to a self-contained component.
+ This needs to be kept around until configuration is in place -->
+ <unit bldFile="/sf/os/devicesrv/resourcemgmt/group"/>
+ </component>
+ <component name="powerandmemorynotificationservice" long-name="Power and Memory Notification Service" introduced="6.0" purpose="mandatory">
+ <unit bldFile="/sf/os/devicesrv/resourcemgmt/powerandmemorynotificationservice/group" mrp="/sf/os/devicesrv/resourcemgmt/powerandmemorynotificationservice/group/syslibs_pwrcli.mrp"/>
+ </component>
+ </collection>
+ <collection name="sysstatemgmt" long-name="System State Management" level="server">
+ <component name="starter" filter="s60" long-name="Starter">
+ <unit bldFile="/sf/os/devicesrv/sysstatemgmt/starter/group"/>
+ <!-- are these test bld.infs needed for the build? -->
+ <!-- <unit bldFile="sysstatemgmt/starter/strtsecnote/group"/> -->
+ <!-- <unit bldFile="sysstatemgmt/starter/strtsecobs/group"/> -->
+ </component>
+ <component name="ssmmapperutility" filter="s60" long-name="SSM Mapper Utility" introduced="^3">
+ <unit bldFile="/sf/os/devicesrv/sysstatemgmt/ssmmapperutility/group"/>
+ </component>
+ <component name="ssmpolicyplugins" filter="s60" long-name="SSM Policy Plugins" introduced="^3" plugin="Y">
+ <unit bldFile="/sf/os/devicesrv/sysstatemgmt/ssmpolicyplugins/group"/>
+ </component>
+ <component name="ssmutilityplugins" filter="s60" long-name="SSM Utility Plugins" introduced="^3" plugin="Y">
+ <unit bldFile="/sf/os/devicesrv/sysstatemgmt/ssmutilityplugins/group"/>
+ </component>
+ <component name="ssmcmdlists" filter="s60" long-name="SSM Command Lists" introduced="^3">
+ <unit bldFile="/sf/os/devicesrv/sysstatemgmt/ssmcmdlists/group"/>
+ </component>
+ <component name="ssmcustcmds" filter="s60" long-name="SSM Custom Commands" introduced="^3">
+ <unit bldFile="/sf/os/devicesrv/sysstatemgmt/ssmcustcmds/group"/>
+ </component>
+ <component name="syslangutil" filter="s60" long-name="System Language Utility" introduced="^3">
+ <unit bldFile="/sf/os/devicesrv/sysstatemgmt/syslangutil/group"/>
+ </component>
+ <component name="sysrestart" filter="s60" long-name="System Restart" introduced="^3">
+ <unit bldFile="/sf/os/devicesrv/sysstatemgmt/sysrestart/group"/>
+ </component>
+ <component name="sysuiprovider" filter="s60" long-name="System UI Provider" introduced="^3">
+ <unit bldFile="/sf/os/devicesrv/sysstatemgmt/sysuiprovider/group"/>
+ </component>
+ <component name="systemstarter" long-name="System Starter" introduced="9.1" deprecated="^3" purpose="mandatory">
+ <unit bldFile="/sf/os/devicesrv/sysstatemgmt/systemstarter/group" mrp="/sf/os/devicesrv/sysstatemgmt/systemstarter/group/app-framework_sysstart.mrp"/>
+ </component>
+ <component name="systemstatemgr" long-name="System State Manager" introduced="^3" purpose="mandatory">
+ <unit bldFile="/sf/os/devicesrv/sysstatemgmt/systemstatemgr/group" mrp="/sf/os/devicesrv/sysstatemgmt/systemstatemgr/group/app-framework_ssma.mrp"/>
+ </component>
+ <component name="systemstateplugins" long-name="System State Plugins" introduced="^3" purpose="optional" plugin="Y">
+ <unit bldFile="/sf/os/devicesrv/sysstatemgmt/systemstateplugins/group" mrp="/sf/os/devicesrv/sysstatemgmt/systemstateplugins/group/app-framework_ssplugins.mrp"/>
+ </component>
+ <component name="systemstatereferenceplugins" long-name="System State Reference Plugins" introduced="^3" purpose="optional" plugin="Y">
+ <unit bldFile="/sf/os/devicesrv/sysstatemgmt/systemstatereferenceplugins/group" mrp="/sf/os/devicesrv/sysstatemgmt/systemstatereferenceplugins/group/app-framework_ssrefplugins.mrp"/>
+ </component>
+ </collection>
+ <collection name="resourceinterfaces" long-name="Resource Interfaces" level="hw-if">
+ <component name="fmtransmittercontrol" long-name="FM Transmitter Control" introduced="^3" purpose="optional">
+ <unit bldFile="/sf/os/devicesrv/resourceinterfaces/fmtransmittercontrol/group" mrp="/sf/os/devicesrv/resourceinterfaces/fmtransmittercontrol/group/telephony_hwrmfmtx.mrp"/>
+ </component>
+ </collection>
+ <collection name="systemhealthmanagement" long-name="System Health Management" level="server">
+ <component name="systemhealthmgr" long-name="System Health Manager" introduced="^3" purpose="optional">
+ <unit bldFile="/sf/os/devicesrv/systemhealthmanagement/systemhealthmgr/group" mrp="/sf/os/devicesrv/systemhealthmanagement/systemhealthmgr/group/app-framework_shma.mrp"/>
+ </component>
+ </collection>
+ <collection name="devicesrvapitest" long-name="Devices Services API Tests" level="app-if">
+ <component name="accessorieshaitest" long-name="Accessories HAI Tests" introduced="^2" purpose="development" filter="test">
+ <unit mrp="/sf/os/devicesrv/devicesrvapitest/accessorieshaitest/group/accessorieshaitest.mrp" bldFile="/sf/os/devicesrv/devicesrvapitest/accessorieshaitest/group"/>
+ </component>
+ <component name="hwrmhaitest" long-name="HWRM HAI Tests" introduced="^2" purpose="development" filter="test">
+ <unit mrp="/sf/os/devicesrv/devicesrvapitest/hwrmhaitest/group/hwrmhaitest.mrp" bldFile="/sf/os/devicesrv/devicesrvapitest/hwrmhaitest/group"/>
+ </component>
+ </collection>
+ <collection name="devicesrv_info" long-name="Device Services Info" level="app-if">
+ <component name="devicesrv_plat" filter="s60" long-name="Device Services Platform Interfaces" class="api">
+ <unit bldFile="/sf/os/devicesrv/devicesrv_plat/group"/>
+ </component>
+ <component name="devicesrv_pub" filter="s60" long-name="Device Services Public Interfaces" class="api">
+ <unit bldFile="/sf/os/devicesrv/devicesrv_pub/group"/>
+ <unit bldFile="/sf/os/devicesrv/devicesrv_pub/platform_path_definitions_api/group" filter="bldmefirst"/>
+ <!-- separate to another component? -->
+ </component>
+ <component name="devicesrv_metadata" long-name="Device Services Metadata" introduced="^2" purpose="development" class="config PC">
+ <unit mrp="/sf/os/devicesrv/devicesrv_info/devicesrv_metadata/devicesrv_metadata.mrp"/>
+ </component>
+ </collection>
+ </block>
+ </layer>
+ </systemModel>
+</SystemDefinition>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/symbian3/os/devicesrv/package_definition_3.0.xml Mon Feb 15 18:25:55 2010 +0000
@@ -0,0 +1,209 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<SystemDefinition schema="3.0.0">
+ <package id="devicesrv" name="Device Services" levels="adaptation hw-if plugin framework server app-if">
+ <collection id="accessoryservices" name="Accessory Services" level="framework">
+ <component id="accessorymonitor" filter="s60" name="Accessory Monitor">
+ <unit bldFile="accessoryservices/accessorymonitor/group"/>
+ </component>
+ <component id="accessoryremotecontrol" filter="s60" name="Accessory Remote Control">
+ <unit bldFile="accessoryservices/accessoryremotecontrol/group"/>
+ </component>
+ <component id="accessoryserver" filter="s60" name="Accessory Server">
+ <unit bldFile="accessoryservices/accessoryserver/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"/>
+ </component>
+ <component id="tspclientmapper" filter="s60" name="TSP Client Mapper">
+ <unit bldFile="accessoryservices/tspclientmapper/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"/>
+ </component>
+ </collection>
+ <collection id="commonservices" name="Common Services" level="app-if">
+ <component id="commonengine" filter="s60" name="Common Engine">
+ <unit bldFile="commonservices/commonengine/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"/>
+ </component>
+ <component id="sysutil" name="System Utilities" purpose="mandatory" introduced="ER5">
+ <unit bldFile="commonservices/sysutil/group" mrp="commonservices/sysutil/group/sysutil.mrp"/>
+ </component>
+ <component id="activitymanager" name="Activity Manager" purpose="mandatory" introduced="ER5">
+ <unit bldFile="commonservices/activitymanager/group" mrp="commonservices/activitymanager/group/activitymanager.mrp"/>
+ </component>
+ </collection>
+ <collection id="dosservices" name="Domestic Operating System Services" level="hw-if">
+ <component id="commondsy" filter="s60" name="Common DSY" class="plugin">
+ <unit bldFile="dosservices/commondsy/group"/>
+ </component>
+ <component id="dosserver" filter="s60" name="Domestic OS Server">
+ <unit bldFile="dosservices/dosserver/group"/>
+ </component>
+ </collection>
+ <collection id="sensorservices" name="Sensor Services" level="framework">
+ <component id="sensorserver" filter="s60" name="Sensor Server">
+ <unit bldFile="sensorservices/sensorserver/group"/>
+ </component>
+ <component id="orientationssy" filter="s60" name="Orientation SSY" class="plugin">
+ <unit bldFile="sensorservices/orientationssy/group"/>
+ </component>
+ <component id="tiltcompensationssy" filter="s60" name="Tilt Compensation SSY" class="plugin">
+ <unit bldFile="sensorservices/tiltcompensationssy/group"/>
+ </component>
+ <component id="sensordatacompensator" filter="s60" name="Sensor Data Compensator">
+ <unit bldFile="sensorservices/sensordatacompensator/group"/>
+ </component>
+ </collection>
+ <collection id="hwrmhaptics" name="HWRM Haptics" level="plugin">
+ <component id="hapticseffectdatagetterfw" filter="s60" name="Haptics Effect Data Getter Framework">
+ <unit bldFile="hwrmhaptics/hapticseffectdatagetterfw/group"/>
+ </component>
+ <component id="hapticspluginservice" filter="s60" name="Haptics Plugin Service">
+ <unit bldFile="hwrmhaptics/hapticspluginservice/group"/>
+ </component>
+ <component id="hapticspacketizer" filter="s60" name="Haptics Packetizer">
+ <unit bldFile="hwrmhaptics/hapticspacketizer/group"/>
+ </component>
+ <component id="hapticspluginmanager" filter="s60" name="Haptics Plugin Manager">
+ <unit bldFile="hwrmhaptics/hapticspluginmanager/group"/>
+ </component>
+ <component id="hapticsserver" filter="s60" name="Haptics Server">
+ <unit bldFile="hwrmhaptics/hapticsserver/group"/>
+ </component>
+ <component id="hapticsclient" filter="s60" name="Haptics Client">
+ <unit bldFile="hwrmhaptics/hapticsclient/group"/>
+ </component>
+ <component id="hwrmhaptics_build" filter="s60" name="HWRM Haptics Build">
+ <!-- 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>
+ </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"/>
+ </component>
+ </collection>
+ <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="vibractrl" filter="s60" name="Vibra Control" deprecated="9.1">
+ <unit bldFile="resourcemgmt/vibractrl/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>
+ <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">
+ <component id="starter" filter="s60" name="Starter">
+ <unit bldFile="sysstatemgmt/starter/group"/>
+ <!-- are these test bld.infs needed for the build? -->
+ <!-- <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>
+ <component id="systemstatemgr" name="System State Manager" introduced="^3" purpose="mandatory">
+ <unit bldFile="sysstatemgmt/systemstatemgr/group" mrp="sysstatemgmt/systemstatemgr/group/app-framework_ssma.mrp"/>
+ </component>
+ <component id="systemstateplugins" name="System State Plugins" introduced="^3" purpose="optional" class="plugin">
+ <unit bldFile="sysstatemgmt/systemstateplugins/group" mrp="sysstatemgmt/systemstateplugins/group/app-framework_ssplugins.mrp"/>
+ </component>
+ <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>
+ </collection>
+ <collection id="resourceinterfaces" name="Resource Interfaces" level="hw-if">
+ <component id="fmtransmittercontrol" name="FM Transmitter Control" introduced="^3" purpose="optional">
+ <unit bldFile="resourceinterfaces/fmtransmittercontrol/group" mrp="resourceinterfaces/fmtransmittercontrol/group/telephony_hwrmfmtx.mrp"/>
+ </component>
+ </collection>
+ <collection id="systemhealthmanagement" name="System Health Management" level="server">
+ <component id="systemhealthmgr" name="System Health Manager" introduced="^3" purpose="optional">
+ <unit bldFile="systemhealthmanagement/systemhealthmgr/group" mrp="systemhealthmanagement/systemhealthmgr/group/app-framework_shma.mrp"/>
+ </component>
+ </collection>
+ <collection id="devicesrvapitest" name="Devices Services API Tests" level="app-if">
+ <component id="accessorieshaitest" name="Accessories HAI Tests" introduced="^2" purpose="development" filter="test">
+ <unit mrp="devicesrvapitest/accessorieshaitest/group/accessorieshaitest.mrp" bldFile="devicesrvapitest/accessorieshaitest/group"/>
+ </component>
+ <component id="hwrmhaitest" name="HWRM HAI Tests" introduced="^2" purpose="development" filter="test">
+ <unit mrp="devicesrvapitest/hwrmhaitest/group/hwrmhaitest.mrp" bldFile="devicesrvapitest/hwrmhaitest/group"/>
+ </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/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"/>
+ </component>
+ </collection>
+ </package>
+</SystemDefinition>
--- a/symbian3/os/graphics/package_definition.xml Fri Feb 12 16:37:22 2010 +0000
+++ b/symbian3/os/graphics/package_definition.xml Mon Feb 15 18:25:55 2010 +0000
@@ -1,231 +1,239 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE SystemDefinition [
- <!ELEMENT SystemDefinition (systemModel?,SystemBuild?)>
- <!ATTLIST SystemDefinition
- name CDATA #REQUIRED
- schema CDATA #REQUIRED>
- <!ELEMENT systemModel (layer+)>
- <!ELEMENT layer (block*|collection*)*>
- <!ATTLIST layer
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED
- levels NMTOKENS #IMPLIED
- span CDATA #IMPLIED>
- <!ELEMENT block (subblock*|collection*)*>
- <!ATTLIST block
- levels NMTOKENS #IMPLIED
- span CDATA #IMPLIED
- level NMTOKEN #IMPLIED
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED>
- <!ELEMENT subblock (collection)*>
- <!ATTLIST subblock
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED>
- <!ELEMENT collection (component)*>
- <!ATTLIST collection
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED
- level NMTOKEN #IMPLIED>
- <!ELEMENT component (unit)*>
- <!ATTLIST component
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED
- deprecated CDATA #IMPLIED
- introduced CDATA #IMPLIED
- contract CDATA #IMPLIED
- plugin (Y|N) 'N'
- filter CDATA #IMPLIED
- class NMTOKENS #IMPLIED
- supports CDATA #IMPLIED
- purpose (optional|mandatory|development) 'optional'>
- <!ELEMENT unit EMPTY>
- <!ATTLIST unit
- mrp CDATA #IMPLIED
- filter CDATA #IMPLIED
- bldFile CDATA #IMPLIED
- root CDATA #IMPLIED
- version NMTOKEN #IMPLIED
- prebuilt NMTOKEN #IMPLIED
- late (Y|N) #IMPLIED
- priority CDATA #IMPLIED>
- <!ELEMENT SystemBuild (option*|target+|targetList+|list+|configuration+)*>
- <!ATTLIST SystemBuild schema CDATA #REQUIRED>
- <!ELEMENT list (ref+)>
- <!ATTLIST list
- name ID #REQUIRED
- description CDATA #REQUIRED>
- <!ELEMENT ref EMPTY>
- <!ATTLIST ref item CDATA #REQUIRED>
- <!ELEMENT targetList EMPTY>
- <!ATTLIST targetList
- name ID #REQUIRED
- description CDATA #REQUIRED
- target IDREFS #REQUIRED>
- <!ELEMENT target EMPTY>
- <!ATTLIST target
- name ID #REQUIRED
- abldTarget CDATA #REQUIRED
- description CDATA #REQUIRED>
- <!ELEMENT option EMPTY>
- <!ATTLIST option
- name ID #REQUIRED
- abldOption CDATA #REQUIRED
- description CDATA #REQUIRED
- enable (Y|N) #REQUIRED>
- <!ELEMENT configuration (listRef+|ref+|task+)*>
- <!ATTLIST configuration
- name ID #REQUIRED
- description CDATA #REQUIRED
- filter CDATA #REQUIRED>
- <!ELEMENT task (listRef*,(buildLayer|specialInstructions))>
- <!ELEMENT listRef EMPTY>
- <!ATTLIST listRef list CDATA #REQUIRED>
- <!ELEMENT buildLayer EMPTY>
- <!ATTLIST buildLayer
- command CDATA #REQUIRED
- targetList IDREFS #IMPLIED
- unitParallel (Y|N) #REQUIRED
- targetParallel (Y|N) 'N'>
- <!ELEMENT specialInstructions EMPTY>
- <!ATTLIST specialInstructions
- name CDATA #REQUIRED
- cwd CDATA #REQUIRED
- root CDATA #IMPLIED
- command CDATA #REQUIRED>
-]>
-<SystemDefinition schema="2.0.1" name="Symbian^3">
-<systemModel>
-<layer name="os" long-name="OS" levels="hw services">
-<block name="graphics" level="services" long-name="Graphics" levels="adaptation engines internal-adaptations device-interface internal-utils app-if">
-<collection name="graphicsresourceservices" long-name="Graphics Resource Services" level="engines">
-<component name="graphicsresource" long-name="Graphics Resource" introduced="tb92" purpose="optional">
-<unit bldFile="/sf/os/graphics/graphicsresourceservices/graphicsresource/group" mrp="/sf/os/graphics/graphicsresourceservices/graphicsresource/group/graphics_graphicsresource.mrp"/>
-</component>
-<component name="graphicsresourceadaptation" long-name="Graphics Resource Adaptation" introduced="tb92" purpose="optional">
-<unit bldFile="/sf/os/graphics/graphicsresourceservices/graphicsresourceadaptation/group" mrp="/sf/os/graphics/graphicsresourceservices/graphicsresourceadaptation/group/graphics_graphicsresourceadapter.mrp"/>
-</component>
-</collection>
-<collection name="graphicsutils" long-name="Graphics Utils" level="engines">
-<component name="commongraphicsheaders" long-name="Common Graphics Headers" introduced="tb92" purpose="mandatory">
-<unit bldFile="/sf/os/graphics/graphicsutils/commongraphicsheaders/group" mrp="/sf/os/graphics/graphicsutils/commongraphicsheaders/group/graphics_commonheader.mrp"/>
-</component>
-</collection>
-<collection name="graphicshwdrivers" long-name="Graphics Hardware Drivers" level="adaptation">
-<component name="displayldd" long-name="Display Drivers" introduced="tb92" purpose="optional">
-<unit bldFile="/sf/os/kernelhwsrv/kernel/eka/drivers/display" mrp="/sf/os/kernelhwsrv/kernel/eka/drivers/display/base_e32_drivers_display.mrp"/>
-</component>
-<component name="surfacemgr" long-name="Surface Manager" introduced="tb92" purpose="optional">
-<unit bldFile="/sf/os/graphics/graphicshwdrivers/surfacemgr/group" mrp="/sf/os/graphics/graphicshwdrivers/surfacemgr/group/graphics_surfacemanager.mrp"/>
-</component>
-</collection>
-<collection name="graphicstest" long-name="Graphics Test" level="app-if">
-<component name="graphicstestharness" long-name="Graphics Test Harness" introduced="8.1" purpose="development">
-<unit mrp="/sf/os/graphics/graphicstest/graphicstestharness/group/graphics_testharness.mrp"/>
-</component>
-<component name="uibench" long-name="UI Bench" introduced="9.2" purpose="development">
-<unit bldFile="/sf/os/graphics/graphicstest/uibench/group" mrp="/sf/os/graphics/graphicstest/uibench/group/graphics_ui_bench.mrp"/>
-</component>
-</collection>
-<collection name="graphics_info" long-name="Graphics Info" level="app-if">
-<component name="graphicsdocs" long-name="Graphics Documentation" purpose="development" class="doc">
-<unit mrp="/sf/os/graphics/graphics_info/graphicsdocs/graphics_documentation.mrp"/>
-</component>
-<component name="graphics_metadata" long-name="Graphics Metadata" introduced="tb91" purpose="development" class="config PC">
-<unit mrp="/sf/os/graphics/graphics_info/graphics_metadata/graphics_metadata.mrp"/>
-</component>
-</collection>
-<collection name="windowing" long-name="Windowing" level="app-if">
-<component name="n:windowserver" long-name="Window Server" purpose="mandatory">
-<!-- intentionally not for the foundation despite being a mandatory component -->
-<unit bldFile="/sf/os/graphics/windowing/windowserver/group" mrp="/sf/os/graphics/windowing/windowserver/group/graphics_wserv.mrp"/>
-</component>
-</collection>
-<collection name="printingservices" long-name="Printing Services" level="app-if">
-<component name="printerdriversupport" long-name="Printer Driver Support" purpose="optional">
-<unit bldFile="/sf/os/graphics/printingservices/printerdriversupport/group" mrp="/sf/os/graphics/printingservices/printerdriversupport/group/graphics_pdrstore.mrp"/>
-</component>
-<component name="printerdrivers" long-name="Printer Drivers" purpose="optional" plugin="Y">
-<unit bldFile="/sf/os/graphics/printingservices/printerdrivers/group" mrp="/sf/os/graphics/printingservices/printerdrivers/group/graphics_printdrv.mrp"/>
-</component>
-</collection>
-<collection name="fbs" long-name="Font and Bitmap Server" level="device-interface">
-<component name="fontandbitmapserver" long-name="Font and Bitmap Server" purpose="mandatory">
-<unit bldFile="/sf/os/graphics/fbs/fontandbitmapserver/group" mrp="/sf/os/graphics/fbs/fontandbitmapserver/group/graphics_fbserv.mrp"/>
-</component>
-</collection>
-<collection name="opengles" long-name="OpenGLES" level="internal-adaptations">
-<component name="openglesinterface" long-name="OpenGL ES Interface" introduced="8.0" purpose="optional">
-<unit bldFile="/sf/os/graphics/opengles/openglesinterface/group" mrp="/sf/os/graphics/opengles/openglesinterface/group/graphics_openglesheaders.mrp"/>
-</component>
-</collection>
-<collection name="openvg" long-name="OpenVG" level="internal-adaptations">
-<component name="openvginterface" long-name="OpenVG Interface" introduced="tb91" purpose="optional">
-<unit bldFile="/sf/os/graphics/openvg/openvginterface/group" mrp="/sf/os/graphics/openvg/openvginterface/group/graphics_openvgheaders.mrp"/>
-</component>
-</collection>
-<collection name="egl" long-name="EGL" level="internal-adaptations">
-<component name="eglinterface" long-name="EGL Interface" introduced="tb91" purpose="optional">
-<unit bldFile="/sf/os/graphics/egl/eglinterface/group" mrp="/sf/os/graphics/egl/eglinterface/group/graphics_eglheaders.mrp"/>
-</component>
-</collection>
-<collection name="graphicsdeviceinterface" long-name="Graphics Device Interface" level="device-interface">
-<component name="gdi" long-name="GDI" purpose="mandatory">
-<unit bldFile="/sf/os/graphics/graphicsdeviceinterface/gdi/group" mrp="/sf/os/graphics/graphicsdeviceinterface/gdi/group/graphics_gdi.mrp"/>
-</component>
-<component name="bitgdi" long-name="BitGDI" purpose="mandatory">
-<unit bldFile="/sf/os/graphics/graphicsdeviceinterface/bitgdi/group" mrp="/sf/os/graphics/graphicsdeviceinterface/bitgdi/group/graphics_bitgdi.mrp"/>
-</component>
-<component name="colourpalette" long-name="Colour Palette" introduced="7.0s" purpose="optional">
-<unit bldFile="/sf/os/graphics/graphicsdeviceinterface/colourpalette/group" mrp="/sf/os/graphics/graphicsdeviceinterface/colourpalette/group/graphics_palette.mrp"/>
-</component>
-<component name="screendriver" long-name="Screen Driver" introduced="6.1" purpose="optional" plugin="Y">
-<unit bldFile="/sf/os/graphics/graphicsdeviceinterface/screendriver/group" mrp="/sf/os/graphics/graphicsdeviceinterface/screendriver/group/graphics_screendriver.mrp"/>
-</component>
-<component name="directgdi" long-name="DirectGDI" introduced="tb92" purpose="optional">
-<unit bldFile="/sf/os/graphics/graphicsdeviceinterface/directgdi/group" mrp="/sf/os/graphics/graphicsdeviceinterface/directgdi/group/graphics_directgdi.mrp"/>
-</component>
-<component name="directgdiinterface" long-name="DirectGDI Interface" introduced="tb92" purpose="optional">
-<unit bldFile="/sf/os/graphics/graphicsdeviceinterface/directgdiinterface/group" mrp="/sf/os/graphics/graphicsdeviceinterface/directgdiinterface/group/graphics_directgdiheaders.mrp"/>
-</component>
-<component name="directgdiadaptation" long-name="DirectGDI Adaptation" introduced="tb92" purpose="optional">
-<unit bldFile="/sf/os/graphics/graphicsdeviceinterface/directgdiadaptation/group" mrp="/sf/os/graphics/graphicsdeviceinterface/directgdiadaptation/group/graphics_directgdiadapter.mrp"/>
-</component>
-</collection>
-<collection name="graphicstools" long-name="Graphics Tools" level="internal-utils">
-<component name="gdi_tools" long-name="GDI Tools" purpose="development" class="PC">
-<unit bldFile="/sf/os/graphics/graphicstools/gdi_tools/group" mrp="/sf/os/graphics/graphicstools/gdi_tools/group/graphics_gditools.mrp"/>
-</component>
-</collection>
-<collection name="graphicsapitest" long-name="Graphics API Tests" level="app-if">
-<component name="graphicssvs" long-name="Graphics Verification Suite" introduced="tb91" purpose="development">
-<unit mrp="/sf/os/graphics/graphicsapitest/graphicssvs/group/graphicssvs.mrp"/>
-</component>
-<component name="screendriverhaitest" long-name="Screen Driver HAI Tests" introduced="tb91" purpose="development">
-<unit mrp="/sf/os/graphics/graphicsapitest/screendriverhaitest/group/screendriverhaitest.mrp"/>
-</component>
-</collection>
-<collection name="s60">
-<component name="graphics">
-<unit bldFile="/sf/os/graphics/group" mrp=""/>
-</component>
-<component name="graphics_plat">
-<unit bldFile="/sf/os/graphics/group/../graphics_plat/group" mrp=""/>
-</component>
-<component name="graphics_m3g_api">
-<unit bldFile="/sf/os/graphics/group/../graphics_plat/m3g_core_api/group" mrp=""/>
-</component>
-<component name="graphics_m3g">
-<unit bldFile="/sf/os/graphics/group/../m3g/m3gcore11/group" mrp=""/>
-</component>
-<component name="graphics_acceleration_vgi">
-<unit bldFile="/sf/os/graphics/group/../graphicsaccelaration/vgi/group" mrp=""/>
-</component>
-<component name="sf_openvg11">
-<unit bldFile="/sf/os/graphics/openvg/openvginterface/group/openvg11" mrp=""/>
-</component>
-</collection>
-</block>
-</layer>
-</systemModel>
-</SystemDefinition>
\ No newline at end of file
+<!DOCTYPE SystemDefinition [
+<!ELEMENT SystemDefinition ( systemModel )>
+<!ATTLIST SystemDefinition
+ name CDATA #REQUIRED
+ schema CDATA #REQUIRED
+>
+<!-- all paths are relative to the environment variable specified by the root attribute, or SOURCEROOT if not. -->
+
+<!-- System Model Section of DTD -->
+<!ELEMENT systemModel (layer+)>
+
+<!ELEMENT layer (block* | collection*)*>
+<!-- Kernel Services, Base Services, OS Services, Etc -->
+<!ATTLIST layer
+ name CDATA #REQUIRED
+ long-name CDATA #IMPLIED
+ levels NMTOKENS #IMPLIED
+ span CDATA #IMPLIED
+>
+
+<!ELEMENT block (subblock* | collection*)*>
+ <!-- Generic OS services, Comms Services, etc -->
+<!ATTLIST block
+ levels NMTOKENS #IMPLIED
+ span CDATA #IMPLIED
+ level NMTOKEN #IMPLIED
+ name CDATA #REQUIRED
+ long-name CDATA #IMPLIED
+>
+
+<!ELEMENT subblock (collection)*>
+<!-- Cellular Baseband Services, Networking Services, etc -->
+<!ATTLIST subblock
+ name CDATA #REQUIRED
+ long-name CDATA #IMPLIED
+>
+
+<!ELEMENT collection (component)*>
+<!-- Screen Driver, Content Handling, etc -->
+<!ATTLIST collection
+ name CDATA #REQUIRED
+ long-name CDATA #IMPLIED
+ level NMTOKEN #IMPLIED
+>
+
+<!ELEMENT component (unit)*>
+<!-- contains units or is a package or prebuilt -->
+<!ATTLIST component
+ name CDATA #REQUIRED
+ long-name CDATA #IMPLIED
+ deprecated CDATA #IMPLIED
+ introduced CDATA #IMPLIED
+ contract CDATA #IMPLIED
+ plugin (Y|N) "N"
+ filter CDATA #IMPLIED
+ class NMTOKENS #IMPLIED
+ supports CDATA #IMPLIED
+ purpose ( optional | mandatory | development ) "optional"
+>
+
+<!ELEMENT unit EMPTY >
+<!-- must be buildable (bld.inf) -->
+<!-- bldFile may someday be removed in favour of mrp -->
+<!ATTLIST unit
+ mrp CDATA #IMPLIED
+ filter CDATA #IMPLIED
+ bldFile CDATA #IMPLIED
+ root CDATA #IMPLIED
+ version NMTOKEN #IMPLIED
+ prebuilt NMTOKEN #IMPLIED
+ late (Y|N) #IMPLIED
+ priority CDATA #IMPLIED
+>
+]>
+<SystemDefinition name="Symbian^3" schema="2.0.1">
+ <systemModel>
+ <layer name="os" long-name="OS" levels="hw services">
+ <block name="graphics" level="services" long-name="Graphics" levels="adaptation engines internal-adaptations device-interface internal-utils app-if">
+ <collection name="graphicsaccelaration" long-name="Graphics Acceleration" level="adaptation">
+ <component name="3d_opengl_es_1_1" filter="s60" long-name="3D OpenGL ES 1.1" introduced="^3">
+ <unit bldFile="/sf/os/graphics/graphicsaccelaration/3d_opengl_es_1_1/group"/>
+ </component>
+ <component name="2d_openvg_1_1" filter="s60" long-name="2D OpenVG 1.1" introduced="^3">
+ <unit bldFile="/sf/os/graphics/graphicsaccelaration/2D_OpenVG_1_1/group"/>
+ </component>
+ <component name="vgi" filter="s60" long-name="VGI">
+ <unit bldFile="/sf/os/graphics/graphicsaccelaration/vgi/group"/>
+ </component>
+ </collection>
+ <collection name="m3g" long-name="Mobile 3D Graphics" level="internal-adaptations">
+ <component name="m3gcore11" filter="s60" long-name="M3G Core 1.1">
+ <unit bldFile="/sf/os/graphics/m3g/m3gcore11/group"/>
+ </component>
+ </collection>
+ <collection name="graphicsresourceservices" long-name="Graphics Resource Services" level="engines">
+ <component name="graphicsresource" long-name="Graphics Resource" introduced="^3" deprecated="^3" purpose="optional">
+ <unit bldFile="/sf/os/graphics/graphicsresourceservices/graphicsresource/group" mrp="/sf/os/graphics/graphicsresourceservices/graphicsresource/group/graphics_graphicsresource.mrp"/>
+ </component>
+ <component name="graphicsresourceadaptation" long-name="Graphics Resource Adaptation" introduced="^3" deprecated="^3" purpose="optional">
+ <unit bldFile="/sf/os/graphics/graphicsresourceservices/graphicsresourceadaptation/group" mrp="/sf/os/graphics/graphicsresourceservices/graphicsresourceadaptation/group/graphics_graphicsresourceadapter.mrp"/>
+ </component>
+ </collection>
+ <collection name="graphicsutils" long-name="Graphics Utils" level="engines">
+ <component name="commongraphicsheaders" long-name="Common Graphics Headers" introduced="^3" purpose="mandatory">
+ <unit bldFile="/sf/os/graphics/graphicsutils/commongraphicsheaders/group" mrp="/sf/os/graphics/graphicsutils/commongraphicsheaders/group/graphics_commonheader.mrp"/>
+ </component>
+ </collection>
+ <collection name="graphicshwdrivers" long-name="Graphics Hardware Drivers" level="adaptation">
+ <!-- displayldd to be moved here -->
+ <component name="surfacemgr" long-name="Surface Manager" introduced="^3" purpose="optional">
+ <unit bldFile="/sf/os/graphics/graphicshwdrivers/surfacemgr/group" mrp="/sf/os/graphics/graphicshwdrivers/surfacemgr/group/graphics_surfacemanager.mrp"/>
+ </component>
+ </collection>
+ <collection name="graphicscomposition" long-name="Graphics Composition" level="engines">
+ <component name="openwfcinterface" long-name="OpenWF Composition Interface" introduced="^3" purpose="optional">
+ <unit bldFile="/sf/os/graphics/graphicscomposition/openwfcinterface/group" mrp="/sf/os/graphics/graphicscomposition/openwfcinterface/group/graphics_openwfcinterface.mrp"/>
+ </component>
+ <component name="openwfcompositionengine" long-name="OpenWF Composition Engine" introduced="^3" purpose="development">
+ <unit bldFile="/sf/os/graphics/graphicscomposition/openwfcompositionengine/group" mrp="/sf/os/graphics/graphicscomposition/openwfcompositionengine/group/graphics_openwfcompositionengine.mrp"/>
+ </component>
+ <component name="openwfsupport" long-name="OpenWF Support" introduced="^3" purpose="optional">
+ <unit bldFile="/sf/os/graphics/graphicscomposition/openwfsupport/group" mrp="/sf/os/graphics/graphicscomposition/openwfsupport/group/graphics_openwfsupport.mrp"/>
+ </component>
+ <component name="surfaceupdate" long-name="Surface Update" introduced="^3" purpose="optional">
+ <unit bldFile="/sf/os/graphics/graphicscomposition/surfaceupdate/group" mrp="/sf/os/graphics/graphicscomposition/surfaceupdate/group/graphics_surfaceupdate.mrp"/>
+ </component>
+ </collection>
+ <collection name="graphicstest" long-name="Graphics Test" level="app-if">
+ <component name="graphicstestharness" long-name="Graphics Test Harness" introduced="8.1" purpose="development" filter="test">
+ <unit mrp="/sf/os/graphics/graphicstest/graphicstestharness/group/graphics_testharness.mrp" bldFile="/sf/os/graphics/graphicstest/graphicstestharness/group"/>
+ </component>
+ <component name="uibench" long-name="UI Bench" introduced="9.2" purpose="development">
+ <unit bldFile="/sf/os/graphics/graphicstest/uibench/group" mrp="/sf/os/graphics/graphicstest/uibench/group/graphics_ui_bench.mrp"/>
+ </component>
+ </collection>
+ <collection name="graphics_info" long-name="Graphics Info" level="app-if">
+ <component name="graphics_plat" filter="s60" long-name="Graphics Platform Interfaces" class="api">
+ <unit bldFile="/sf/os/graphics/graphics_plat/group"/>
+ </component>
+ <component name="graphics_pub" filter="s60" long-name="Graphics Public Interfaces" class="api">
+ <unit bldFile="/sf/os/graphics/graphics_pub/group"/>
+ </component>
+ <component name="graphicsdocs" long-name="Graphics Documentation" purpose="development" class="doc">
+ <unit mrp="/sf/os/graphics/graphics_info/graphicsdocs/graphics_documentation.mrp"/>
+ </component>
+ <component name="graphics_metadata" long-name="Graphics Metadata" introduced="^2" purpose="development" class="config PC">
+ <unit mrp="/sf/os/graphics/graphics_info/graphics_metadata/graphics_metadata.mrp"/>
+ </component>
+ </collection>
+ <collection name="windowing" long-name="Windowing" level="app-if">
+ <component name="windowserver" long-name="Window Server" purpose="mandatory">
+ <unit bldFile="/sf/os/graphics/windowing/windowserver/group" mrp="/sf/os/graphics/windowing/windowserver/group/graphics_wserv.mrp"/>
+ </component>
+ <component name="windowserverplugins" long-name="Window Server Plugins" introduced="^3" purpose="optional" plugin="Y">
+ <unit bldFile="/sf/os/graphics/windowing/windowserverplugins/group" mrp="/sf/os/graphics/windowing/windowserverplugins/group/graphics_wserv_std_plugins.mrp"/>
+ </component>
+ </collection>
+ <collection name="printingservices" long-name="Printing Services" level="app-if">
+ <component name="printerdriversupport" long-name="Printer Driver Support" purpose="optional">
+ <unit bldFile="/sf/os/graphics/printingservices/printerdriversupport/group" mrp="/sf/os/graphics/printingservices/printerdriversupport/group/graphics_pdrstore.mrp"/>
+ </component>
+ <component name="printerdrivers" long-name="Printer Drivers" purpose="optional" plugin="Y">
+ <unit bldFile="/sf/os/graphics/printingservices/printerdrivers/group" mrp="/sf/os/graphics/printingservices/printerdrivers/group/graphics_printdrv.mrp"/>
+ </component>
+ </collection>
+ <collection name="fbs" long-name="Font and Bitmap Server" level="device-interface">
+ <component name="fontandbitmapserver" long-name="Font and Bitmap Server" purpose="mandatory">
+ <unit bldFile="/sf/os/graphics/fbs/fontandbitmapserver/group" mrp="/sf/os/graphics/fbs/fontandbitmapserver/group/graphics_fbserv.mrp"/>
+ </component>
+ </collection>
+ <collection name="opengles" long-name="OpenGLES" level="internal-adaptations">
+ <component name="openglesinterface" long-name="OpenGL ES Interface" introduced="8.0" purpose="optional">
+ <unit bldFile="/sf/os/graphics/opengles/openglesinterface/group" mrp="/sf/os/graphics/opengles/openglesinterface/group/graphics_openglesheaders.mrp"/>
+ </component>
+ </collection>
+ <collection name="openvg" long-name="OpenVG" level="internal-adaptations">
+ <component name="openvginterface" long-name="OpenVG Interface" introduced="^2" purpose="optional">
+ <unit bldFile="/sf/os/graphics/openvg/openvginterface/group" mrp="/sf/os/graphics/openvg/openvginterface/group/graphics_openvgheaders.mrp"/>
+ </component>
+ <component name="openvg11" filter="s60" long-name="OpenVG 1.1">
+ <!-- this needs to be moved to it's own component directory, ie openvg/openvg11 -->
+ <unit bldFile="/sf/os/graphics/openvg/openvginterface/group/openvg11"/>
+ </component>
+ </collection>
+ <collection name="egl" long-name="EGL" level="internal-adaptations">
+ <component name="eglinterface" long-name="EGL Interface" introduced="^2" purpose="optional">
+ <unit bldFile="/sf/os/graphics/egl/eglinterface/group" mrp="/sf/os/graphics/egl/eglinterface/group/graphics_eglheaders.mrp"/>
+ </component>
+ <component name="eglswitch" long-name="EGL Switch" introduced="^3" purpose="optional">
+ <unit bldFile="/sf/os/graphics/egl/eglswitch/group" mrp="/sf/os/graphics/egl/eglswitch/group/graphics_eglswitch.mrp"/>
+ </component>
+ <component name="eglrefimpl" long-name="EGL Reference Implementation" introduced="^3" purpose="optional">
+ <unit bldFile="/sf/os/graphics/egl/eglrefimpl/group" mrp="/sf/os/graphics/egl/eglrefimpl/group/graphics_eglrefimpl.mrp"/>
+ </component>
+ <component name="egltest" long-name="EGL Tests" introduced="^3" purpose="development">
+ <unit bldFile="/sf/os/graphics/egl/egltest/group" mrp="/sf/os/graphics/egl/egltest/group/graphics_egltest.mrp"/>
+ </component>
+ </collection>
+ <collection name="graphicsdeviceinterface" long-name="Graphics Device Interface" level="device-interface">
+ <component name="gdi" long-name="GDI" purpose="mandatory">
+ <unit bldFile="/sf/os/graphics/graphicsdeviceinterface/gdi/group" mrp="/sf/os/graphics/graphicsdeviceinterface/gdi/group/graphics_gdi.mrp"/>
+ </component>
+ <component name="bitgdi" long-name="BitGDI" purpose="mandatory">
+ <unit bldFile="/sf/os/graphics/graphicsdeviceinterface/bitgdi/group" mrp="/sf/os/graphics/graphicsdeviceinterface/bitgdi/group/graphics_bitgdi.mrp"/>
+ </component>
+ <component name="colourpalette" long-name="Colour Palette" introduced="7.0s" purpose="optional">
+ <unit bldFile="/sf/os/graphics/graphicsdeviceinterface/colourpalette/group" mrp="/sf/os/graphics/graphicsdeviceinterface/colourpalette/group/graphics_palette.mrp"/>
+ </component>
+ <component name="screendriver" long-name="Screen Driver" introduced="6.1" purpose="optional" plugin="Y">
+ <unit bldFile="/sf/os/graphics/graphicsdeviceinterface/screendriver/group" mrp="/sf/os/graphics/graphicsdeviceinterface/screendriver/group/graphics_screendriver.mrp"/>
+ </component>
+ <component name="directgdi" long-name="DirectGDI" introduced="^3" deprecated="^3" purpose="optional">
+ <unit bldFile="/sf/os/graphics/graphicsdeviceinterface/directgdi/group" mrp="/sf/os/graphics/graphicsdeviceinterface/directgdi/group/graphics_directgdi.mrp"/>
+ </component>
+ <component name="directgdiinterface" long-name="DirectGDI Interface" introduced="^3" deprecated="^3" purpose="optional">
+ <unit bldFile="/sf/os/graphics/graphicsdeviceinterface/directgdiinterface/group" mrp="/sf/os/graphics/graphicsdeviceinterface/directgdiinterface/group/graphics_directgdiheaders.mrp"/>
+ </component>
+ <component name="directgdiadaptation" long-name="DirectGDI Adaptation" introduced="^3" deprecated="^3" purpose="optional">
+ <unit bldFile="/sf/os/graphics/graphicsdeviceinterface/directgdiadaptation/group" mrp="/sf/os/graphics/graphicsdeviceinterface/directgdiadaptation/group/graphics_directgdiadapter.mrp"/>
+ </component>
+ </collection>
+ <collection name="graphicstools" long-name="Graphics Tools" level="internal-utils">
+ <component name="gdi_tools" long-name="GDI Tools" purpose="development" class="PC">
+ <unit bldFile="/sf/os/graphics/graphicstools/gdi_tools/group" mrp="/sf/os/graphics/graphicstools/gdi_tools/group/graphics_gditools.mrp"/>
+ </component>
+ </collection>
+ <collection name="graphicsapitest" long-name="Graphics API Tests" level="app-if">
+ <component name="graphicssvs" long-name="Graphics Verification Suite" introduced="^2" purpose="development" filter="test">
+ <unit mrp="/sf/os/graphics/graphicsapitest/graphicssvs/group/graphicssvs.mrp" bldFile="/sf/os/graphics/graphicsapitest/graphicssvs/group"/>
+ </component>
+ <component name="screendriverhaitest" long-name="Screen Driver HAI Tests" introduced="^2" purpose="development" filter="test">
+ <unit mrp="/sf/os/graphics/graphicsapitest/screendriverhaitest/group/screendriverhaitest.mrp" bldFile="/sf/os/graphics/graphicsapitest/screendriverhaitest/group"/>
+ </component>
+ </collection>
+ </block>
+ </layer>
+ </systemModel>
+</SystemDefinition>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/symbian3/os/graphics/package_definition_3.0.xml Mon Feb 15 18:25:55 2010 +0000
@@ -0,0 +1,161 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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>
+ </collection>
+ <collection id="m3g" name="Mobile 3D Graphics" level="internal-adaptations">
+ <component id="m3gcore11" filter="s60" name="M3G Core 1.1">
+ <unit bldFile="m3g/m3gcore11/group"/>
+ </component>
+ </collection>
+ <collection id="graphicsresourceservices" name="Graphics Resource Services" level="engines">
+ <component id="graphicsresource" name="Graphics Resource" introduced="^3" deprecated="^3" purpose="optional">
+ <unit bldFile="graphicsresourceservices/graphicsresource/group" mrp="graphicsresourceservices/graphicsresource/group/graphics_graphicsresource.mrp"/>
+ </component>
+ <component id="graphicsresourceadaptation" name="Graphics Resource Adaptation" introduced="^3" deprecated="^3" purpose="optional">
+ <unit bldFile="graphicsresourceservices/graphicsresourceadaptation/group" mrp="graphicsresourceservices/graphicsresourceadaptation/group/graphics_graphicsresourceadapter.mrp"/>
+ </component>
+ </collection>
+ <collection id="graphicsutils" name="Graphics Utils" level="engines">
+ <component id="commongraphicsheaders" name="Common Graphics Headers" introduced="^3" purpose="mandatory">
+ <unit bldFile="graphicsutils/commongraphicsheaders/group" mrp="graphicsutils/commongraphicsheaders/group/graphics_commonheader.mrp"/>
+ </component>
+ </collection>
+ <collection id="graphicshwdrivers" name="Graphics Hardware Drivers" level="adaptation">
+ <!-- displayldd to be moved here -->
+ <component id="surfacemgr" name="Surface Manager" introduced="^3" purpose="optional">
+ <unit bldFile="graphicshwdrivers/surfacemgr/group" mrp="graphicshwdrivers/surfacemgr/group/graphics_surfacemanager.mrp"/>
+ </component>
+ </collection>
+ <collection id="graphicscomposition" name="Graphics Composition" level="engines">
+ <component id="openwfcinterface" name="OpenWF Composition Interface" introduced="^3" purpose="optional">
+ <unit bldFile="graphicscomposition/openwfcinterface/group" mrp="graphicscomposition/openwfcinterface/group/graphics_openwfcinterface.mrp"/>
+ </component>
+ <component id="openwfcompositionengine" name="OpenWF Composition Engine" introduced="^3" purpose="development">
+ <unit bldFile="graphicscomposition/openwfcompositionengine/group" mrp="graphicscomposition/openwfcompositionengine/group/graphics_openwfcompositionengine.mrp"/>
+ </component>
+ <component id="openwfsupport" name="OpenWF Support" introduced="^3" purpose="optional">
+ <unit bldFile="graphicscomposition/openwfsupport/group" mrp="graphicscomposition/openwfsupport/group/graphics_openwfsupport.mrp"/>
+ </component>
+ <component id="surfaceupdate" name="Surface Update" introduced="^3" purpose="optional">
+ <unit bldFile="graphicscomposition/surfaceupdate/group" mrp="graphicscomposition/surfaceupdate/group/graphics_surfaceupdate.mrp"/>
+ </component>
+ </collection>
+ <collection id="graphicstest" name="Graphics Test" level="app-if">
+ <component id="graphicstestharness" name="Graphics Test Harness" introduced="8.1" purpose="development" filter="test">
+ <unit mrp="graphicstest/graphicstestharness/group/graphics_testharness.mrp" bldFile="graphicstest/graphicstestharness/group"/>
+ </component>
+ <component id="uibench" name="UI Bench" introduced="9.2" purpose="development">
+ <unit bldFile="graphicstest/uibench/group" mrp="graphicstest/uibench/group/graphics_ui_bench.mrp"/>
+ </component>
+ </collection>
+ <collection id="graphics_info" name="Graphics Info" level="app-if">
+ <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>
+ <component id="graphics_metadata" name="Graphics Metadata" class="config" introduced="^2" purpose="development" target="desktop">
+ <unit mrp="graphics_info/graphics_metadata/graphics_metadata.mrp"/>
+ </component>
+ </collection>
+ <collection id="windowing" name="Windowing" level="app-if">
+ <component id="windowserver" name="Window Server" purpose="mandatory">
+ <unit bldFile="windowing/windowserver/group" mrp="windowing/windowserver/group/graphics_wserv.mrp"/>
+ </component>
+ <component id="windowserverplugins" name="Window Server Plugins" introduced="^3" purpose="optional" class="plugin">
+ <unit bldFile="windowing/windowserverplugins/group" mrp="windowing/windowserverplugins/group/graphics_wserv_std_plugins.mrp"/>
+ </component>
+ </collection>
+ <collection id="printingservices" name="Printing Services" level="app-if">
+ <component id="printerdriversupport" name="Printer Driver Support" purpose="optional">
+ <unit bldFile="printingservices/printerdriversupport/group" mrp="printingservices/printerdriversupport/group/graphics_pdrstore.mrp"/>
+ </component>
+ <component id="printerdrivers" name="Printer Drivers" purpose="optional" class="plugin">
+ <unit bldFile="printingservices/printerdrivers/group" mrp="printingservices/printerdrivers/group/graphics_printdrv.mrp"/>
+ </component>
+ </collection>
+ <collection id="fbs" name="Font and Bitmap Server" level="device-interface">
+ <component id="fontandbitmapserver" name="Font and Bitmap Server" purpose="mandatory">
+ <unit bldFile="fbs/fontandbitmapserver/group" mrp="fbs/fontandbitmapserver/group/graphics_fbserv.mrp"/>
+ </component>
+ </collection>
+ <collection id="opengles" name="OpenGLES" level="internal-adaptations">
+ <component id="openglesinterface" name="OpenGL ES Interface" introduced="8.0" purpose="optional">
+ <unit bldFile="opengles/openglesinterface/group" mrp="opengles/openglesinterface/group/graphics_openglesheaders.mrp"/>
+ </component>
+ </collection>
+ <collection id="openvg" name="OpenVG" level="internal-adaptations">
+ <component id="openvginterface" name="OpenVG Interface" introduced="^2" purpose="optional">
+ <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>
+ <collection id="egl" name="EGL" level="internal-adaptations">
+ <component id="eglinterface" name="EGL Interface" introduced="^2" purpose="optional">
+ <unit bldFile="egl/eglinterface/group" mrp="egl/eglinterface/group/graphics_eglheaders.mrp"/>
+ </component>
+ <component id="eglswitch" name="EGL Switch" introduced="^3" purpose="optional">
+ <unit bldFile="egl/eglswitch/group" mrp="egl/eglswitch/group/graphics_eglswitch.mrp"/>
+ </component>
+ <component id="eglrefimpl" name="EGL Reference Implementation" introduced="^3" purpose="optional">
+ <unit bldFile="egl/eglrefimpl/group" mrp="egl/eglrefimpl/group/graphics_eglrefimpl.mrp"/>
+ </component>
+ <component id="egltest" name="EGL Tests" introduced="^3" purpose="development">
+ <unit bldFile="egl/egltest/group" mrp="egl/egltest/group/graphics_egltest.mrp"/>
+ </component>
+ </collection>
+ <collection id="graphicsdeviceinterface" name="Graphics Device Interface" level="device-interface">
+ <component id="gdi" name="GDI" purpose="mandatory">
+ <unit bldFile="graphicsdeviceinterface/gdi/group" mrp="graphicsdeviceinterface/gdi/group/graphics_gdi.mrp"/>
+ </component>
+ <component id="bitgdi" name="BitGDI" purpose="mandatory">
+ <unit bldFile="graphicsdeviceinterface/bitgdi/group" mrp="graphicsdeviceinterface/bitgdi/group/graphics_bitgdi.mrp"/>
+ </component>
+ <component id="colourpalette" name="Colour Palette" introduced="7.0s" purpose="optional">
+ <unit bldFile="graphicsdeviceinterface/colourpalette/group" mrp="graphicsdeviceinterface/colourpalette/group/graphics_palette.mrp"/>
+ </component>
+ <component id="screendriver" name="Screen Driver" introduced="6.1" purpose="optional" class="plugin">
+ <unit bldFile="graphicsdeviceinterface/screendriver/group" mrp="graphicsdeviceinterface/screendriver/group/graphics_screendriver.mrp"/>
+ </component>
+ <component id="directgdi" name="DirectGDI" introduced="^3" deprecated="^3" purpose="optional">
+ <unit bldFile="graphicsdeviceinterface/directgdi/group" mrp="graphicsdeviceinterface/directgdi/group/graphics_directgdi.mrp"/>
+ </component>
+ <component id="directgdiinterface" name="DirectGDI Interface" introduced="^3" deprecated="^3" purpose="optional">
+ <unit bldFile="graphicsdeviceinterface/directgdiinterface/group" mrp="graphicsdeviceinterface/directgdiinterface/group/graphics_directgdiheaders.mrp"/>
+ </component>
+ <component id="directgdiadaptation" name="DirectGDI Adaptation" introduced="^3" deprecated="^3" purpose="optional">
+ <unit bldFile="graphicsdeviceinterface/directgdiadaptation/group" mrp="graphicsdeviceinterface/directgdiadaptation/group/graphics_directgdiadapter.mrp"/>
+ </component>
+ </collection>
+ <collection id="graphicstools" name="Graphics Tools" level="internal-utils">
+ <component id="gdi_tools" name="GDI Tools" purpose="development" target="desktop">
+ <unit bldFile="graphicstools/gdi_tools/group" mrp="graphicstools/gdi_tools/group/graphics_gditools.mrp"/>
+ </component>
+ </collection>
+ <collection id="graphicsapitest" name="Graphics API Tests" level="app-if">
+ <component id="graphicssvs" name="Graphics Verification Suite" introduced="^2" purpose="development" filter="test">
+ <unit mrp="graphicsapitest/graphicssvs/group/graphicssvs.mrp" bldFile="graphicsapitest/graphicssvs/group"/>
+ </component>
+ <component id="screendriverhaitest" name="Screen Driver HAI Tests" introduced="^2" purpose="development" filter="test">
+ <unit mrp="graphicsapitest/screendriverhaitest/group/screendriverhaitest.mrp" bldFile="graphicsapitest/screendriverhaitest/group"/>
+ </component>
+ </collection>
+ </package>
+</SystemDefinition>
--- a/symbian3/os/imagingext/package_definition.xml Fri Feb 12 16:37:22 2010 +0000
+++ b/symbian3/os/imagingext/package_definition.xml Mon Feb 15 18:25:55 2010 +0000
@@ -1,109 +1,114 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE SystemDefinition [
- <!ELEMENT SystemDefinition (systemModel?,SystemBuild?)>
- <!ATTLIST SystemDefinition
- name CDATA #REQUIRED
- schema CDATA #REQUIRED>
- <!ELEMENT systemModel (layer+)>
- <!ELEMENT layer (block*|collection*)*>
- <!ATTLIST layer
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED
- levels NMTOKENS #IMPLIED
- span CDATA #IMPLIED>
- <!ELEMENT block (subblock*|collection*)*>
- <!ATTLIST block
- levels NMTOKENS #IMPLIED
- span CDATA #IMPLIED
- level NMTOKEN #IMPLIED
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED>
- <!ELEMENT subblock (collection)*>
- <!ATTLIST subblock
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED>
- <!ELEMENT collection (component)*>
- <!ATTLIST collection
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED
- level NMTOKEN #IMPLIED>
- <!ELEMENT component (unit)*>
- <!ATTLIST component
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED
- deprecated CDATA #IMPLIED
- introduced CDATA #IMPLIED
- contract CDATA #IMPLIED
- plugin (Y|N) 'N'
- filter CDATA #IMPLIED
- class NMTOKENS #IMPLIED
- supports CDATA #IMPLIED
- purpose (optional|mandatory|development) 'optional'>
- <!ELEMENT unit EMPTY>
- <!ATTLIST unit
- mrp CDATA #IMPLIED
- filter CDATA #IMPLIED
- bldFile CDATA #IMPLIED
- root CDATA #IMPLIED
- version NMTOKEN #IMPLIED
- prebuilt NMTOKEN #IMPLIED
- late (Y|N) #IMPLIED
- priority CDATA #IMPLIED>
- <!ELEMENT SystemBuild (option*|target+|targetList+|list+|configuration+)*>
- <!ATTLIST SystemBuild schema CDATA #REQUIRED>
- <!ELEMENT list (ref+)>
- <!ATTLIST list
- name ID #REQUIRED
- description CDATA #REQUIRED>
- <!ELEMENT ref EMPTY>
- <!ATTLIST ref item CDATA #REQUIRED>
- <!ELEMENT targetList EMPTY>
- <!ATTLIST targetList
- name ID #REQUIRED
- description CDATA #REQUIRED
- target IDREFS #REQUIRED>
- <!ELEMENT target EMPTY>
- <!ATTLIST target
- name ID #REQUIRED
- abldTarget CDATA #REQUIRED
- description CDATA #REQUIRED>
- <!ELEMENT option EMPTY>
- <!ATTLIST option
- name ID #REQUIRED
- abldOption CDATA #REQUIRED
- description CDATA #REQUIRED
- enable (Y|N) #REQUIRED>
- <!ELEMENT configuration (listRef+|ref+|task+)*>
- <!ATTLIST configuration
- name ID #REQUIRED
- description CDATA #REQUIRED
- filter CDATA #REQUIRED>
- <!ELEMENT task (listRef*,(buildLayer|specialInstructions))>
- <!ELEMENT listRef EMPTY>
- <!ATTLIST listRef list CDATA #REQUIRED>
- <!ELEMENT buildLayer EMPTY>
- <!ATTLIST buildLayer
- command CDATA #REQUIRED
- targetList IDREFS #IMPLIED
- unitParallel (Y|N) #REQUIRED
- targetParallel (Y|N) 'N'>
- <!ELEMENT specialInstructions EMPTY>
- <!ATTLIST specialInstructions
- name CDATA #REQUIRED
- cwd CDATA #REQUIRED
- root CDATA #IMPLIED
- command CDATA #REQUIRED>
-]>
-<SystemDefinition schema="2.0.1" name="Symbian^3">
-<systemModel>
-<layer name="os">
-<block name="imagingext">
-<collection name="s60">
-<component name="imagingext">
-<unit bldFile="/sf/os/imagingext/group" mrp=""/>
-</component>
-</collection>
-</block>
-</layer>
-</systemModel>
+<!DOCTYPE SystemDefinition [
+<!ELEMENT SystemDefinition ( systemModel )>
+<!ATTLIST SystemDefinition
+ name CDATA #REQUIRED
+ schema CDATA #REQUIRED
+>
+<!-- all paths are relative to the environment variable specified by the root attribute, or SOURCEROOT if not. -->
+
+<!-- System Model Section of DTD -->
+<!ELEMENT systemModel (layer+)>
+
+<!ELEMENT layer (block* | collection*)*>
+<!-- Kernel Services, Base Services, OS Services, Etc -->
+<!ATTLIST layer
+ name CDATA #REQUIRED
+ long-name CDATA #IMPLIED
+ levels NMTOKENS #IMPLIED
+ span CDATA #IMPLIED
+>
+
+<!ELEMENT block (subblock* | collection*)*>
+ <!-- Generic OS services, Comms Services, etc -->
+<!ATTLIST block
+ levels NMTOKENS #IMPLIED
+ span CDATA #IMPLIED
+ level NMTOKEN #IMPLIED
+ name CDATA #REQUIRED
+ long-name CDATA #IMPLIED
+>
+
+<!ELEMENT subblock (collection)*>
+<!-- Cellular Baseband Services, Networking Services, etc -->
+<!ATTLIST subblock
+ name CDATA #REQUIRED
+ long-name CDATA #IMPLIED
+>
+
+<!ELEMENT collection (component)*>
+<!-- Screen Driver, Content Handling, etc -->
+<!ATTLIST collection
+ name CDATA #REQUIRED
+ long-name CDATA #IMPLIED
+ level NMTOKEN #IMPLIED
+>
+
+<!ELEMENT component (unit)*>
+<!-- contains units or is a package or prebuilt -->
+<!ATTLIST component
+ name CDATA #REQUIRED
+ long-name CDATA #IMPLIED
+ deprecated CDATA #IMPLIED
+ introduced CDATA #IMPLIED
+ contract CDATA #IMPLIED
+ plugin (Y|N) "N"
+ filter CDATA #IMPLIED
+ class NMTOKENS #IMPLIED
+ supports CDATA #IMPLIED
+ purpose ( optional | mandatory | development ) "optional"
+>
+
+<!ELEMENT unit EMPTY >
+<!-- must be buildable (bld.inf) -->
+<!-- bldFile may someday be removed in favour of mrp -->
+<!ATTLIST unit
+ mrp CDATA #IMPLIED
+ filter CDATA #IMPLIED
+ bldFile CDATA #IMPLIED
+ root CDATA #IMPLIED
+ version NMTOKEN #IMPLIED
+ prebuilt NMTOKEN #IMPLIED
+ late (Y|N) #IMPLIED
+ priority CDATA #IMPLIED
+>
+]>
+<SystemDefinition name="Symbian^3" schema="2.0.1">
+ <systemModel>
+ <layer name="os" long-name="OS" levels="hw services">
+ <block name="imagingext" level="services" long-name="Imaging Extensions" levels="adaptation hw-if plugin framework server app-if">
+ <collection name="imageadaptationextensions" long-name="Image Adaptation Extensions" level="app-if">
+ <component name="iclextjpegapi" filter="s60" long-name="ICL Extension JPEG API">
+ <unit bldFile="/sf/os/imagingext/imageadaptationextensions/iclextjpegapi/group"/>
+ </component>
+ <component name="imageadaptationextensions_build" filter="s60" long-name="Image Adaptation Extensions Build">
+ <!-- Move the export from this bld.inf into the above one and remove this component, or make this a ROM component -->
+ <unit bldFile="/sf/os/imagingext/imageadaptationextensions/group"/>
+ </component>
+ </collection>
+ <collection name="imagingmodules" long-name="Imaging Modules" level="hw-if">
+ <component name="exiflib" filter="s60" long-name="Exif Library">
+ <unit bldFile="/sf/os/imagingext/imagingmodules/exiflib/group"/>
+ </component>
+ <component name="jp2kcodec" filter="s60" long-name="JPEG2000 Decoder Plugin" plugin="Y">
+ <unit bldFile="/sf/os/imagingext/imagingmodules/jp2kcodec/group"/>
+ </component>
+ </collection>
+ <collection name="imagingext_info" long-name="Imaging Extensions Info" level="app-if">
+ <component name="imagingext_plat" filter="s60" long-name="Imaging Extensions Platform Interfaces" class="api">
+ <unit bldFile="/sf/os/imagingext/imagingext_plat/group"/>
+ </component>
+ <component name="imagingext_pub" filter="s60" long-name="Imaging Extensions Public Interfaces" class="api">
+ <unit bldFile="/sf/os/imagingext/imagingext_pub/group"/>
+ </component>
+ <component name="imagingext_test" filter="s60,api_test" long-name="Imaging Extensions Platform API Tests" purpose="development">
+ <unit bldFile="/sf/os/imagingext/imagingext_plat/extended_icl_jpeg_api/tsrc/group"/>
+ </component>
+ <component name="imagingext_test" filter="s60,api_test" long-name="Imaging Extensions Public API Tests" purpose="development">
+ <unit bldFile="/sf/os/imagingext/imagingext_pub/exif_api/tsrc/group"/>
+ </component>
+ </collection>
+ </block>
+ </layer>
+ </systemModel>
</SystemDefinition>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/symbian3/os/imagingext/package_definition_3.0.xml Mon Feb 15 18:25:55 2010 +0000
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<SystemDefinition schema="3.0.0">
+ <package id="imagingext" name="Imaging Extensions" levels="adaptation hw-if plugin framework server app-if">
+ <collection id="imageadaptationextensions" name="Image Adaptation Extensions" level="app-if">
+ <component id="iclextjpegapi" filter="s60" name="ICL Extension JPEG API">
+ <unit bldFile="imageadaptationextensions/iclextjpegapi/group"/>
+ </component>
+ <component id="imageadaptationextensions_build" filter="s60" name="Image Adaptation Extensions Build">
+ <!-- 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>
+ <collection id="imagingmodules" name="Imaging Modules" level="hw-if">
+ <component id="exiflib" filter="s60" name="Exif Library">
+ <unit bldFile="imagingmodules/exiflib/group"/>
+ </component>
+ <component id="jp2kcodec" filter="s60" name="JPEG2000 Decoder Plugin" class="plugin">
+ <unit bldFile="imagingmodules/jp2kcodec/group"/>
+ </component>
+ </collection>
+ <collection id="imagingext_info" name="Imaging Extensions Info" level="app-if">
+ <component id="imagingext_plat" filter="s60" name="Imaging Extensions Platform Interfaces" class="api">
+ <unit bldFile="imagingext_plat/group"/>
+ </component>
+ <component id="imagingext_pub" filter="s60" name="Imaging Extensions Public Interfaces" class="api">
+ <unit bldFile="imagingext_pub/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>
+</SystemDefinition>
--- a/symbian3/os/kernelhwsrv/package_definition.xml Fri Feb 12 16:37:22 2010 +0000
+++ b/symbian3/os/kernelhwsrv/package_definition.xml Mon Feb 15 18:25:55 2010 +0000
@@ -1,234 +1,216 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE SystemDefinition [
- <!ELEMENT SystemDefinition (systemModel?,SystemBuild?)>
- <!ATTLIST SystemDefinition
- name CDATA #REQUIRED
- schema CDATA #REQUIRED>
- <!ELEMENT systemModel (layer+)>
- <!ELEMENT layer (block*|collection*)*>
- <!ATTLIST layer
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED
- levels NMTOKENS #IMPLIED
- span CDATA #IMPLIED>
- <!ELEMENT block (subblock*|collection*)*>
- <!ATTLIST block
- levels NMTOKENS #IMPLIED
- span CDATA #IMPLIED
- level NMTOKEN #IMPLIED
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED>
- <!ELEMENT subblock (collection)*>
- <!ATTLIST subblock
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED>
- <!ELEMENT collection (component)*>
- <!ATTLIST collection
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED
- level NMTOKEN #IMPLIED>
- <!ELEMENT component (unit)*>
- <!ATTLIST component
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED
- deprecated CDATA #IMPLIED
- introduced CDATA #IMPLIED
- contract CDATA #IMPLIED
- plugin (Y|N) 'N'
- filter CDATA #IMPLIED
- class NMTOKENS #IMPLIED
- supports CDATA #IMPLIED
- purpose (optional|mandatory|development) 'optional'>
- <!ELEMENT unit EMPTY>
- <!ATTLIST unit
- mrp CDATA #IMPLIED
- filter CDATA #IMPLIED
- bldFile CDATA #IMPLIED
- root CDATA #IMPLIED
- version NMTOKEN #IMPLIED
- prebuilt NMTOKEN #IMPLIED
- late (Y|N) #IMPLIED
- priority CDATA #IMPLIED>
- <!ELEMENT SystemBuild (option*|target+|targetList+|list+|configuration+)*>
- <!ATTLIST SystemBuild schema CDATA #REQUIRED>
- <!ELEMENT list (ref+)>
- <!ATTLIST list
- name ID #REQUIRED
- description CDATA #REQUIRED>
- <!ELEMENT ref EMPTY>
- <!ATTLIST ref item CDATA #REQUIRED>
- <!ELEMENT targetList EMPTY>
- <!ATTLIST targetList
- name ID #REQUIRED
- description CDATA #REQUIRED
- target IDREFS #REQUIRED>
- <!ELEMENT target EMPTY>
- <!ATTLIST target
- name ID #REQUIRED
- abldTarget CDATA #REQUIRED
- description CDATA #REQUIRED>
- <!ELEMENT option EMPTY>
- <!ATTLIST option
- name ID #REQUIRED
- abldOption CDATA #REQUIRED
- description CDATA #REQUIRED
- enable (Y|N) #REQUIRED>
- <!ELEMENT configuration (listRef+|ref+|task+)*>
- <!ATTLIST configuration
- name ID #REQUIRED
- description CDATA #REQUIRED
- filter CDATA #REQUIRED>
- <!ELEMENT task (listRef*,(buildLayer|specialInstructions))>
- <!ELEMENT listRef EMPTY>
- <!ATTLIST listRef list CDATA #REQUIRED>
- <!ELEMENT buildLayer EMPTY>
- <!ATTLIST buildLayer
- command CDATA #REQUIRED
- targetList IDREFS #IMPLIED
- unitParallel (Y|N) #REQUIRED
- targetParallel (Y|N) 'N'>
- <!ELEMENT specialInstructions EMPTY>
- <!ATTLIST specialInstructions
- name CDATA #REQUIRED
- cwd CDATA #REQUIRED
- root CDATA #IMPLIED
- command CDATA #REQUIRED>
-]>
-<SystemDefinition schema="2.0.1" name="Symbian^3">
-<systemModel>
-<layer name="os" long-name="OS" levels="hw services">
-<block name="kernelhwsrv" level="hw" long-name="Kernel and Hardware Services" levels="hw-if adaptation framework test">
-<collection name="baseintegtests" long-name="Base Integration Testing" level="test">
-<component name="baseintegrationtest" long-name="Base Integration Test" introduced="9.3" purpose="development">
-<unit bldFile="/sf/os/kernelhwsrv/baseintegtests/baseintegrationtest/group" mrp="/sf/os/kernelhwsrv/baseintegtests/baseintegrationtest/group/base_integration_test.mrp"/>
-</component>
-</collection>
-<collection name="brdbootldr" long-name="Board Boot Loader" level="hw-if">
-<component name="ubootldr" long-name="Boot Loader" introduced="9.2" purpose="optional">
-<unit mrp="/sf/os/kernelhwsrv/brdbootldr/ubootldr/base_ubootldr.mrp"/>
-</component>
-</collection>
-<collection name="bsptemplate" long-name="BSP Template" level="hw-if">
-<component name="asspandvariant" long-name="Template ASSP and Variant" introduced="6.0" purpose="development">
-<unit bldFile="/sf/os/kernelhwsrv/bsptemplate/asspandvariant/template_variant" mrp="/sf/os/kernelhwsrv/bsptemplate/asspandvariant/base_template.mrp"/>
-</component>
-</collection>
-<collection name="kernel" long-name="Kernel Architecture" level="adaptation">
-<component name="eka" long-name="Kernel Architecture" introduced="8.0" purpose="mandatory">
-<unit bldFile="/sf/os/kernelhwsrv/kernel/eka" mrp="/sf/os/kernelhwsrv/kernel/eka/base_e32.mrp"/>
-</component>
-</collection>
-<collection name="kerneltest" long-name="Kernel Test" level="hw-if">
-<component name="e32utils" long-name="E32 Utilities" purpose="development">
-<unit bldFile="/sf/os/kernelhwsrv/kerneltest/e32utils/group" mrp="/sf/os/kernelhwsrv/kerneltest/e32utils/group/base_e32utils.mrp"/>
-</component>
-<component name="e32test" long-name="E32 Tests" purpose="development">
-<unit bldFile="/sf/os/kernelhwsrv/kerneltest/e32test/group" mrp="/sf/os/kernelhwsrv/kerneltest/e32test/group/base_e32test.mrp"/>
-</component>
-<component name="f32test" long-name="File Server Tests" purpose="development">
-<unit bldFile="/sf/os/kernelhwsrv/kerneltest/f32test/group" mrp="/sf/os/kernelhwsrv/kerneltest/f32test/group/base_f32test.mrp"/>
-</component>
-</collection>
-<collection name="ldds" long-name="Logical Device Drivers" level="adaptation">
-<component name="ethernetldd" long-name="Ethernet Drivers" purpose="optional">
-<unit bldFile="/sf/os/kernelhwsrv/kernel/eka/drivers/ethernet" mrp="/sf/os/kernelhwsrv/kernel/eka/drivers/ethernet/base_e32_drivers_ethernet.mrp"/>
-</component>
-<component name="audioldd" long-name="Audio Drivers" introduced="8.1b" purpose="optional">
-<unit bldFile="/sf/os/kernelhwsrv/kernel/eka/drivers/soundsc" mrp="/sf/os/kernelhwsrv/kernel/eka/drivers/soundsc/base_e32_drivers_sound.mrp"/>
-</component>
-<component name="serialldd" long-name="Serial Port Drivers" purpose="optional">
-<unit bldFile="/sf/os/kernelhwsrv/kernel/eka/drivers/ecomm" mrp="/sf/os/kernelhwsrv/kernel/eka/drivers/ecomm/base_e32_drivers_ecomm.mrp"/>
-</component>
-<component name="legacydrivers" long-name="Legacy Drivers" purpose="optional">
-<unit mrp="/sf/os/kernelhwsrv/kernel/eka/drivers/adc/base_e32_drivers_adc.mrp"/>
-</component>
-<component name="locmedia" long-name="Local Media Subsystem" introduced="8.1b" purpose="mandatory">
-<!-- these are LDDs for storage media-->
-<unit bldFile="/sf/os/kernelhwsrv/kernel/eka/drivers/locmedia" mrp="/sf/os/kernelhwsrv/kernel/eka/drivers/locmedia/base_e32_drivers_locmedia.mrp"/>
-</component>
-<component name="runmodedebugger" long-name="Run Mode Debugger" purpose="mandatory">
-<unit bldFile="/sf/os/kernelhwsrv/kernel/eka/drivers/debug/group" mrp="/sf/os/kernelhwsrv/kernel/eka/drivers/debug/group/base_e32_drivers_debug.mrp"/>
-</component>
-<component name="btrace" long-name="Kernel Trace Tool" purpose="mandatory">
-<unit bldFile="/sf/os/kernelhwsrv/kernel/eka/drivers/trace" mrp="/sf/os/kernelhwsrv/kernel/eka/drivers/trace/base_e32_drivers_trace.mrp"/>
-</component>
-<component name="cameraldd" long-name="Camera Drivers" introduced="tb92" purpose="optional">
-<unit bldFile="/sf/os/kernelhwsrv/kernel/eka/drivers/camerasc" mrp="/sf/os/kernelhwsrv/kernel/eka/drivers/camerasc/base_drivers_camerasc.mrp"/>
-</component>
-</collection>
-<collection name="driversupport" long-name="Generic Driver Support" level="hw-if">
-<component name="mediadrivers" long-name="Media Drivers" purpose="optional">
-<!-- these are for storage media-->
-<unit bldFile="/sf/os/kernelhwsrv/kernel/eka/drivers/media" mrp="/sf/os/kernelhwsrv/kernel/eka/drivers/media/base_e32_drivers_media.mrp"/>
-</component>
-<component name="genericboardsupport" long-name="Generic Board Support" purpose="optional">
-<unit bldFile="/sf/os/kernelhwsrv/kernel/eka/drivers/bsp" mrp="/sf/os/kernelhwsrv/kernel/eka/drivers/bsp/base_e32_drivers_bsp.mrp"/>
-</component>
-</collection>
-<collection name="userlibandfileserver" long-name="User Library and File Server" level="framework">
-<component name="euser" long-name="User Library" purpose="mandatory">
-<unit bldFile="/sf/os/kernelhwsrv/kernel/eka/euser" mrp="/sf/os/kernelhwsrv/kernel/eka/euser/base_e32_euser.mrp"/>
-</component>
-<component name="compsupp" long-name="Compiler Runtime Support" filter="gt" purpose="mandatory">
-<unit bldFile="/sf/os/kernelhwsrv/kernel/eka/compsupp" mrp="/sf/os/kernelhwsrv/kernel/eka/compsupp/base_e32_compsupp.mrp"/>
-</component>
-<component name="fileserver" long-name="File Server" filter="gt" purpose="mandatory">
-<unit bldFile="/sf/os/kernelhwsrv/userlibandfileserver/fileserver/group" mrp="/sf/os/kernelhwsrv/userlibandfileserver/fileserver/group/base_f32.mrp"/>
-</component>
-<component name="estart" long-name="Base Starter" filter="gt" purpose="optional">
-<unit bldFile="/sf/os/kernelhwsrv/userlibandfileserver/fileserver/estart" mrp="/sf/os/kernelhwsrv/userlibandfileserver/fileserver/estart/base_f32_estart.mrp"/>
-</component>
-<component name="domainmgr" long-name="Domain Manager" introduced="8.1b" purpose="mandatory">
-<unit bldFile="/sf/os/kernelhwsrv/userlibandfileserver/domainmgr/group" mrp="/sf/os/kernelhwsrv/userlibandfileserver/domainmgr/group/base_domain.mrp"/>
-</component>
-</collection>
-<collection name="filesystems" long-name="File Systems" level="framework">
-<component name="romfs" long-name="ROM File System" filter="gt" purpose="optional" plugin="Y">
-<unit mrp="/sf/os/kernelhwsrv/userlibandfileserver/fileserver/srom/base_f32_srom.mrp"/>
-</component>
-<component name="rofs" long-name="ROFS" filter="gt" purpose="optional" plugin="Y">
-<unit bldFile="/sf/os/kernelhwsrv/userlibandfileserver/fileserver/srofs" mrp="/sf/os/kernelhwsrv/userlibandfileserver/fileserver/srofs/base_f32_srofs.mrp"/>
-</component>
-<component name="usbmsfs" long-name="USB Mass Storage File System" filter="gt" purpose="optional" plugin="Y">
-<unit bldFile="/sf/os/kernelhwsrv/userlibandfileserver/fileserver/smassstorage" mrp="/sf/os/kernelhwsrv/userlibandfileserver/fileserver/smassstorage/base_f32_smassstorage.mrp"/>
-</component>
-<component name="usbhostmssrv" long-name="USB Host Mass Storage Server" filter="gt" introduced="tb92" purpose="optional" plugin="Y">
-<unit bldFile="/sf/os/kernelhwsrv/userlibandfileserver/fileserver/shostmassstorage" mrp="/sf/os/kernelhwsrv/userlibandfileserver/fileserver/shostmassstorage/base_f32_shostmassstorage.mrp"/>
-</component>
-<component name="fat32fs" long-name="FAT32 File System" filter="gt" purpose="optional" plugin="Y">
-<unit bldFile="/sf/os/kernelhwsrv/userlibandfileserver/fileserver/sfat32" mrp="/sf/os/kernelhwsrv/userlibandfileserver/fileserver/sfat32/base_f32_sfat32.mrp"/>
-</component>
-<component name="fatfs" long-name="FAT File System" filter="gt" purpose="optional" plugin="Y">
-<unit bldFile="/sf/os/kernelhwsrv/userlibandfileserver/fileserver/sfat" mrp="/sf/os/kernelhwsrv/userlibandfileserver/fileserver/sfat/base_f32_sfat.mrp"/>
-</component>
-<component name="compfs" long-name="Composite File System" filter="gt" purpose="optional" plugin="Y">
-<unit bldFile="/sf/os/kernelhwsrv/userlibandfileserver/fileserver/scomp" mrp="/sf/os/kernelhwsrv/userlibandfileserver/fileserver/scomp/base_f32_scomp.mrp"/>
-</component>
-</collection>
-<collection name="halservices" long-name="HAL Services" level="framework">
-<component name="hal" long-name="User-Side Hardware Abstraction" introduced="6.0" purpose="optional">
-<unit bldFile="/sf/os/kernelhwsrv/halservices/hal" mrp="/sf/os/kernelhwsrv/halservices/hal/base_hal.mrp"/>
-</component>
-</collection>
-<collection name="textmodeshell" long-name="Text Mode Shell" level="test">
-<component name="e32wsrv" long-name="Text Window Server" purpose="optional">
-<unit bldFile="/sf/os/kernelhwsrv/kernel/eka/ewsrv" mrp="/sf/os/kernelhwsrv/kernel/eka/ewsrv/base_e32_ewsrv.mrp"/>
-</component>
-<component name="textshell" long-name="Text Shell" filter="gt" purpose="development">
-<unit bldFile="/sf/os/kernelhwsrv/userlibandfileserver/fileserver/etshell" mrp="/sf/os/kernelhwsrv/userlibandfileserver/fileserver/etshell/base_f32_eshell.mrp"/>
-</component>
-</collection>
-<collection name="baseapitest" long-name="Base API Tests" level="test">
-<component name="basesvs" long-name="Base Verification Suite" introduced="tb91" purpose="development">
-<unit mrp="/sf/os/kernelhwsrv/baseapitest/basesvs/group/basesvs.mrp"/>
-</component>
-</collection>
-<collection name="kernelhwsrv_info" long-name="Kernel and Hardware Services Info" level="test">
-<component name="kernelhwsrv_metadata" long-name="Kernel and Hardware Services Metadata" introduced="tb91" purpose="development" class="config PC">
-<unit mrp="/sf/os/kernelhwsrv/kernelhwsrv_info/kernelhwsrv_metadata/kernelhwsrv_metadata.mrp"/>
-</component>
-</collection>
-</block>
-</layer>
-</systemModel>
-</SystemDefinition>
\ No newline at end of file
+<!DOCTYPE SystemDefinition [
+<!ELEMENT SystemDefinition ( systemModel )>
+<!ATTLIST SystemDefinition
+ name CDATA #REQUIRED
+ schema CDATA #REQUIRED
+>
+<!-- all paths are relative to the environment variable specified by the root attribute, or SOURCEROOT if not. -->
+
+<!-- System Model Section of DTD -->
+<!ELEMENT systemModel (layer+)>
+
+<!ELEMENT layer (block* | collection*)*>
+<!-- Kernel Services, Base Services, OS Services, Etc -->
+<!ATTLIST layer
+ name CDATA #REQUIRED
+ long-name CDATA #IMPLIED
+ levels NMTOKENS #IMPLIED
+ span CDATA #IMPLIED
+>
+
+<!ELEMENT block (subblock* | collection*)*>
+ <!-- Generic OS services, Comms Services, etc -->
+<!ATTLIST block
+ levels NMTOKENS #IMPLIED
+ span CDATA #IMPLIED
+ level NMTOKEN #IMPLIED
+ name CDATA #REQUIRED
+ long-name CDATA #IMPLIED
+>
+
+<!ELEMENT subblock (collection)*>
+<!-- Cellular Baseband Services, Networking Services, etc -->
+<!ATTLIST subblock
+ name CDATA #REQUIRED
+ long-name CDATA #IMPLIED
+>
+
+<!ELEMENT collection (component)*>
+<!-- Screen Driver, Content Handling, etc -->
+<!ATTLIST collection
+ name CDATA #REQUIRED
+ long-name CDATA #IMPLIED
+ level NMTOKEN #IMPLIED
+>
+
+<!ELEMENT component (unit)*>
+<!-- contains units or is a package or prebuilt -->
+<!ATTLIST component
+ name CDATA #REQUIRED
+ long-name CDATA #IMPLIED
+ deprecated CDATA #IMPLIED
+ introduced CDATA #IMPLIED
+ contract CDATA #IMPLIED
+ plugin (Y|N) "N"
+ filter CDATA #IMPLIED
+ class NMTOKENS #IMPLIED
+ supports CDATA #IMPLIED
+ purpose ( optional | mandatory | development ) "optional"
+>
+
+<!ELEMENT unit EMPTY >
+<!-- must be buildable (bld.inf) -->
+<!-- bldFile may someday be removed in favour of mrp -->
+<!ATTLIST unit
+ mrp CDATA #IMPLIED
+ filter CDATA #IMPLIED
+ bldFile CDATA #IMPLIED
+ root CDATA #IMPLIED
+ version NMTOKEN #IMPLIED
+ prebuilt NMTOKEN #IMPLIED
+ late (Y|N) #IMPLIED
+ priority CDATA #IMPLIED
+>
+]>
+<SystemDefinition name="Symbian^3" schema="2.0.1">
+ <systemModel>
+ <layer name="os" long-name="OS" levels="hw services">
+ <block name="kernelhwsrv" level="hw" long-name="Kernel and Hardware Services" levels="hw-if adaptation framework test">
+ <collection name="brdbootldr" long-name="Board Boot Loader" level="hw-if">
+ <component name="ubootldr" long-name="Boot Loader" introduced="9.2" purpose="optional">
+ <unit mrp="/sf/os/kernelhwsrv/brdbootldr/ubootldr/base_ubootldr.mrp"/>
+ </component>
+ </collection>
+ <collection name="bsptemplate" long-name="Board Support Package Template" level="hw-if">
+ <component name="asspandvariant" long-name="Template ASSP and Variant" introduced="6.0" purpose="development">
+ <unit bldFile="/sf/os/kernelhwsrv/bsptemplate/asspandvariant/template_variant" mrp="/sf/os/kernelhwsrv/bsptemplate/asspandvariant/base_template.mrp"/>
+ </component>
+ </collection>
+ <collection name="kernel" long-name="Kernel Architecture" level="adaptation">
+ <component name="eka" long-name="Kernel Architecture" introduced="8.0" purpose="mandatory">
+ <unit bldFile="/sf/os/kernelhwsrv/kernel/eka" mrp="/sf/os/kernelhwsrv/kernel/eka/base_e32.mrp"/>
+ </component>
+ </collection>
+ <collection name="kerneltest" long-name="Kernel Test" level="hw-if">
+ <component name="e32utils" long-name="E32 Utilities" purpose="development">
+ <unit bldFile="/sf/os/kernelhwsrv/kerneltest/e32utils/group" mrp="/sf/os/kernelhwsrv/kerneltest/e32utils/group/base_e32utils.mrp"/>
+ </component>
+ <component name="e32test" long-name="E32 Tests" purpose="development">
+ <unit bldFile="/sf/os/kernelhwsrv/kerneltest/e32test/group" mrp="/sf/os/kernelhwsrv/kerneltest/e32test/group/base_e32test.mrp"/>
+ </component>
+ <component name="f32test" long-name="File Server Tests" purpose="development">
+ <unit bldFile="/sf/os/kernelhwsrv/kerneltest/f32test/group" mrp="/sf/os/kernelhwsrv/kerneltest/f32test/group/base_f32test.mrp"/>
+ </component>
+ </collection>
+ <collection name="ldds" long-name="Logical Device Drivers" level="adaptation">
+ <component name="ethernetldd" long-name="Ethernet Drivers" purpose="optional">
+ <unit bldFile="/sf/os/kernelhwsrv/kernel/eka/drivers/ethernet" mrp="/sf/os/kernelhwsrv/kernel/eka/drivers/ethernet/base_e32_drivers_ethernet.mrp"/>
+ </component>
+ <component name="audioldd" long-name="Audio Drivers" introduced="8.1b" purpose="optional">
+ <unit bldFile="/sf/os/kernelhwsrv/kernel/eka/drivers/soundsc" mrp="/sf/os/kernelhwsrv/kernel/eka/drivers/soundsc/base_e32_drivers_sound.mrp"/>
+ </component>
+ <component name="serialldd" long-name="Serial Port Drivers" purpose="optional">
+ <unit bldFile="/sf/os/kernelhwsrv/kernel/eka/drivers/ecomm" mrp="/sf/os/kernelhwsrv/kernel/eka/drivers/ecomm/base_e32_drivers_ecomm.mrp"/>
+ </component>
+ <component name="legacydrivers" long-name="Legacy Drivers" purpose="optional">
+ <unit mrp="/sf/os/kernelhwsrv/kernel/eka/drivers/adc/base_e32_drivers_adc.mrp"/>
+ </component>
+ <component name="locmedia" long-name="Local Media Subsystem" introduced="8.1b" purpose="mandatory">
+ <!-- these are LDDs for storage media-->
+ <unit bldFile="/sf/os/kernelhwsrv/kernel/eka/drivers/locmedia" mrp="/sf/os/kernelhwsrv/kernel/eka/drivers/locmedia/base_e32_drivers_locmedia.mrp"/>
+ </component>
+ <component name="runmodedebugger" long-name="Run Mode Debugger" purpose="mandatory">
+ <unit bldFile="/sf/os/kernelhwsrv/kernel/eka/drivers/debug/group" mrp="/sf/os/kernelhwsrv/kernel/eka/drivers/debug/group/base_e32_drivers_debug.mrp"/>
+ </component>
+ <component name="btrace" long-name="Kernel Trace Tool" purpose="mandatory">
+ <unit bldFile="/sf/os/kernelhwsrv/kernel/eka/drivers/trace" mrp="/sf/os/kernelhwsrv/kernel/eka/drivers/trace/base_e32_drivers_trace.mrp"/>
+ </component>
+ <component name="cameraldd" long-name="Camera Drivers" introduced="^3" purpose="optional">
+ <unit bldFile="/sf/os/kernelhwsrv/kernel/eka/drivers/camerasc" mrp="/sf/os/kernelhwsrv/kernel/eka/drivers/camerasc/base_drivers_camerasc.mrp"/>
+ </component>
+ <component name="displayldd" long-name="Display Drivers" introduced="^3" purpose="optional">
+ <!-- owned and maintained by graphics package. To be moved there as soon as technical limitations are resolved -->
+ <unit bldFile="/sf/os/kernelhwsrv/kernel/eka/drivers/display" mrp="/sf/os/kernelhwsrv/kernel/eka/drivers/display/base_e32_drivers_display.mrp"/>
+ </component>
+ <component name="usbclientdrivers" long-name="USB Client Drivers" introduced="8.1b" purpose="optional">
+ <!-- owned and maintained by usb package. To be moved there as soon as technical limitations are resolved -->
+ <unit bldFile="/sf/os/kernelhwsrv/kernel/eka/drivers/usbc" mrp="/sf/os/kernelhwsrv/kernel/eka/drivers/usbc/base_e32_drivers_usbcli.mrp"/>
+ </component>
+ </collection>
+ <collection name="driversupport" long-name="Generic Driver Support" level="hw-if">
+ <component name="mediadrivers" long-name="Media Drivers" purpose="optional">
+ <!-- these are for storage media-->
+ <unit bldFile="/sf/os/kernelhwsrv/kernel/eka/drivers/media" mrp="/sf/os/kernelhwsrv/kernel/eka/drivers/media/base_e32_drivers_media.mrp"/>
+ </component>
+ <component name="genericboardsupport" long-name="Generic Board Support" purpose="optional">
+ <unit bldFile="/sf/os/kernelhwsrv/kernel/eka/drivers/bsp" mrp="/sf/os/kernelhwsrv/kernel/eka/drivers/bsp/base_e32_drivers_bsp.mrp"/>
+ </component>
+ </collection>
+ <collection name="userlibandfileserver" long-name="User Library and File Server" level="framework">
+ <component name="euser" long-name="User Library" purpose="mandatory">
+ <unit bldFile="/sf/os/kernelhwsrv/kernel/eka/euser" mrp="/sf/os/kernelhwsrv/kernel/eka/euser/base_e32_euser.mrp"/>
+ </component>
+ <component name="compsupp" long-name="Compiler Runtime Support" filter="gt" purpose="mandatory">
+ <unit bldFile="/sf/os/kernelhwsrv/kernel/eka/compsupp" mrp="/sf/os/kernelhwsrv/kernel/eka/compsupp/base_e32_compsupp.mrp"/>
+ </component>
+ <component name="fileserver" long-name="File Server" filter="gt" purpose="mandatory">
+ <unit bldFile="/sf/os/kernelhwsrv/userlibandfileserver/fileserver/group" mrp="/sf/os/kernelhwsrv/userlibandfileserver/fileserver/group/base_f32.mrp"/>
+ </component>
+ <component name="estart" long-name="Base Starter" filter="gt" purpose="optional">
+ <unit bldFile="/sf/os/kernelhwsrv/userlibandfileserver/fileserver/estart" mrp="/sf/os/kernelhwsrv/userlibandfileserver/fileserver/estart/base_f32_estart.mrp"/>
+ </component>
+ <component name="domainmgr" long-name="Domain Manager" introduced="8.1b" purpose="mandatory">
+ <unit bldFile="/sf/os/kernelhwsrv/userlibandfileserver/domainmgr/group" mrp="/sf/os/kernelhwsrv/userlibandfileserver/domainmgr/group/base_domain.mrp"/>
+ </component>
+ </collection>
+ <collection name="filesystems" long-name="File Systems" level="framework">
+ <component name="romfs" long-name="ROM File System" filter="gt" purpose="optional" plugin="Y">
+ <unit mrp="/sf/os/kernelhwsrv/userlibandfileserver/fileserver/srom/base_f32_srom.mrp"/>
+ </component>
+ <component name="rofs" long-name="ROFS" filter="gt" purpose="optional" plugin="Y">
+ <unit bldFile="/sf/os/kernelhwsrv/userlibandfileserver/fileserver/srofs" mrp="/sf/os/kernelhwsrv/userlibandfileserver/fileserver/srofs/base_f32_srofs.mrp"/>
+ </component>
+ <component name="usbmsfs" long-name="USB Mass Storage File System" filter="gt" purpose="optional" plugin="Y">
+ <unit bldFile="/sf/os/kernelhwsrv/userlibandfileserver/fileserver/smassstorage" mrp="/sf/os/kernelhwsrv/userlibandfileserver/fileserver/smassstorage/base_f32_smassstorage.mrp"/>
+ </component>
+ <component name="usbhostmssrv" long-name="USB Host Mass Storage Server" filter="gt" introduced="^3" purpose="optional" plugin="Y">
+ <unit bldFile="/sf/os/kernelhwsrv/userlibandfileserver/fileserver/shostmassstorage" mrp="/sf/os/kernelhwsrv/userlibandfileserver/fileserver/shostmassstorage/base_f32_shostmassstorage.mrp"/>
+ </component>
+ <component name="fat32fs" long-name="FAT32 File System" filter="gt" purpose="optional" plugin="Y">
+ <unit bldFile="/sf/os/kernelhwsrv/userlibandfileserver/fileserver/sfat32" mrp="/sf/os/kernelhwsrv/userlibandfileserver/fileserver/sfat32/base_f32_sfat32.mrp"/>
+ </component>
+ <component name="fatfs" long-name="FAT File System" filter="gt" purpose="optional" plugin="Y">
+ <unit bldFile="/sf/os/kernelhwsrv/userlibandfileserver/fileserver/sfat" mrp="/sf/os/kernelhwsrv/userlibandfileserver/fileserver/sfat/base_f32_sfat.mrp"/>
+ </component>
+ <component name="compfs" long-name="Composite File System" filter="gt" purpose="optional" plugin="Y">
+ <unit bldFile="/sf/os/kernelhwsrv/userlibandfileserver/fileserver/scomp" mrp="/sf/os/kernelhwsrv/userlibandfileserver/fileserver/scomp/base_f32_scomp.mrp"/>
+ </component>
+ </collection>
+ <collection name="halservices" long-name="HAL Services" level="framework">
+ <component name="hal" long-name="User-Side Hardware Abstraction" introduced="6.0" purpose="optional">
+ <unit bldFile="/sf/os/kernelhwsrv/halservices/hal" mrp="/sf/os/kernelhwsrv/halservices/hal/base_hal.mrp"/>
+ </component>
+ </collection>
+ <collection name="textmodeshell" long-name="Text Mode Shell" level="test">
+ <component name="e32wsrv" long-name="Text Window Server" purpose="optional">
+ <unit bldFile="/sf/os/kernelhwsrv/kernel/eka/ewsrv" mrp="/sf/os/kernelhwsrv/kernel/eka/ewsrv/base_e32_ewsrv.mrp"/>
+ </component>
+ <component name="textshell" long-name="Text Shell" filter="gt" purpose="development">
+ <unit bldFile="/sf/os/kernelhwsrv/userlibandfileserver/fileserver/etshell" mrp="/sf/os/kernelhwsrv/userlibandfileserver/fileserver/etshell/base_f32_eshell.mrp"/>
+ </component>
+ </collection>
+ <collection name="baseapitest" long-name="Base API Tests" level="test">
+ <component name="basesvs" long-name="Base Verification Suite" introduced="^2" purpose="development" filter="test">
+ <unit mrp="/sf/os/kernelhwsrv/baseapitest/basesvs/group/basesvs.mrp" bldFile="/sf/os/kernelhwsrv/baseapitest/basesvs/group"/>
+ </component>
+ </collection>
+ <collection name="kernelhwsrv_info" long-name="Kernel and Hardware Services Info" level="test">
+ <component name="kernelhwsrv_metadata" long-name="Kernel and Hardware Services Metadata" introduced="^2" purpose="development" class="config PC">
+ <unit mrp="/sf/os/kernelhwsrv/kernelhwsrv_info/kernelhwsrv_metadata/kernelhwsrv_metadata.mrp"/>
+ </component>
+ </collection>
+ </block>
+ </layer>
+ </systemModel>
+</SystemDefinition>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/symbian3/os/kernelhwsrv/package_definition_3.0.xml Mon Feb 15 18:25:55 2010 +0000
@@ -0,0 +1,138 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<SystemDefinition schema="3.0.0">
+ <package id="kernelhwsrv" name="Kernel and Hardware Services" levels="hw-if adaptation framework test">
+ <collection id="brdbootldr" name="Board Boot Loader" level="hw-if">
+ <component id="ubootldr" name="Boot Loader" introduced="9.2" purpose="optional">
+ <unit mrp="brdbootldr/ubootldr/base_ubootldr.mrp"/>
+ </component>
+ </collection>
+ <collection id="bsptemplate" name="Board Support Package Template" level="hw-if">
+ <component id="asspandvariant" name="Template ASSP and Variant" introduced="6.0" purpose="development">
+ <unit bldFile="bsptemplate/asspandvariant/template_variant" mrp="bsptemplate/asspandvariant/base_template.mrp"/>
+ </component>
+ </collection>
+ <collection id="kernel" name="Kernel Architecture" level="adaptation">
+ <component id="eka" name="Kernel Architecture" introduced="8.0" purpose="mandatory">
+ <unit bldFile="kernel/eka" mrp="kernel/eka/base_e32.mrp"/>
+ </component>
+ </collection>
+ <collection id="kerneltest" name="Kernel Test" level="hw-if">
+ <component id="e32utils" name="E32 Utilities" purpose="development">
+ <unit bldFile="kerneltest/e32utils/group" mrp="kerneltest/e32utils/group/base_e32utils.mrp"/>
+ </component>
+ <component id="e32test" name="E32 Tests" purpose="development">
+ <unit bldFile="kerneltest/e32test/group" mrp="kerneltest/e32test/group/base_e32test.mrp"/>
+ </component>
+ <component id="f32test" name="File Server Tests" purpose="development">
+ <unit bldFile="kerneltest/f32test/group" mrp="kerneltest/f32test/group/base_f32test.mrp"/>
+ </component>
+ </collection>
+ <collection id="ldds" name="Logical Device Drivers" level="adaptation">
+ <component id="ethernetldd" name="Ethernet Drivers" purpose="optional">
+ <unit bldFile="kernel/eka/drivers/ethernet" mrp="kernel/eka/drivers/ethernet/base_e32_drivers_ethernet.mrp"/>
+ </component>
+ <component id="audioldd" name="Audio Drivers" introduced="8.1b" purpose="optional">
+ <unit bldFile="kernel/eka/drivers/soundsc" mrp="kernel/eka/drivers/soundsc/base_e32_drivers_sound.mrp"/>
+ </component>
+ <component id="serialldd" name="Serial Port Drivers" purpose="optional">
+ <unit bldFile="kernel/eka/drivers/ecomm" mrp="kernel/eka/drivers/ecomm/base_e32_drivers_ecomm.mrp"/>
+ </component>
+ <component id="legacydrivers" name="Legacy Drivers" purpose="optional">
+ <unit mrp="kernel/eka/drivers/adc/base_e32_drivers_adc.mrp"/>
+ </component>
+ <component id="locmedia" name="Local Media Subsystem" introduced="8.1b" purpose="mandatory">
+ <!-- these are LDDs for storage media-->
+ <unit bldFile="kernel/eka/drivers/locmedia" mrp="kernel/eka/drivers/locmedia/base_e32_drivers_locmedia.mrp"/>
+ </component>
+ <component id="runmodedebugger" name="Run Mode Debugger" purpose="mandatory">
+ <unit bldFile="kernel/eka/drivers/debug/group" mrp="kernel/eka/drivers/debug/group/base_e32_drivers_debug.mrp"/>
+ </component>
+ <component id="btrace" name="Kernel Trace Tool" purpose="mandatory">
+ <unit bldFile="kernel/eka/drivers/trace" mrp="kernel/eka/drivers/trace/base_e32_drivers_trace.mrp"/>
+ </component>
+ <component id="cameraldd" name="Camera Drivers" introduced="^3" purpose="optional">
+ <unit bldFile="kernel/eka/drivers/camerasc" mrp="kernel/eka/drivers/camerasc/base_drivers_camerasc.mrp"/>
+ </component>
+ <component id="displayldd" name="Display Drivers" introduced="^3" purpose="optional">
+ <!-- owned and maintained by graphics package. To be moved there as soon as technical limitations are resolved -->
+ <unit bldFile="kernel/eka/drivers/display" mrp="kernel/eka/drivers/display/base_e32_drivers_display.mrp"/>
+ </component>
+ <component id="usbclientdrivers" name="USB Client Drivers" introduced="8.1b" purpose="optional">
+ <!-- owned and maintained by usb package. To be moved there as soon as technical limitations are resolved -->
+ <unit bldFile="kernel/eka/drivers/usbc" mrp="kernel/eka/drivers/usbc/base_e32_drivers_usbcli.mrp"/>
+ </component>
+ </collection>
+ <collection id="driversupport" name="Generic Driver Support" level="hw-if">
+ <component id="mediadrivers" name="Media Drivers" purpose="optional">
+ <!-- these are for storage media-->
+ <unit bldFile="kernel/eka/drivers/media" mrp="kernel/eka/drivers/media/base_e32_drivers_media.mrp"/>
+ </component>
+ <component id="genericboardsupport" name="Generic Board Support" purpose="optional">
+ <unit bldFile="kernel/eka/drivers/bsp" mrp="kernel/eka/drivers/bsp/base_e32_drivers_bsp.mrp"/>
+ </component>
+ </collection>
+ <collection id="userlibandfileserver" name="User Library and File Server" level="framework">
+ <component id="euser" name="User Library" purpose="mandatory">
+ <unit bldFile="kernel/eka/euser" mrp="kernel/eka/euser/base_e32_euser.mrp"/>
+ </component>
+ <component id="compsupp" name="Compiler Runtime Support" filter="gt" purpose="mandatory">
+ <unit bldFile="kernel/eka/compsupp" mrp="kernel/eka/compsupp/base_e32_compsupp.mrp"/>
+ </component>
+ <component id="fileserver" name="File Server" filter="gt" purpose="mandatory">
+ <unit bldFile="userlibandfileserver/fileserver/group" mrp="userlibandfileserver/fileserver/group/base_f32.mrp"/>
+ </component>
+ <component id="estart" name="Base Starter" filter="gt" purpose="optional">
+ <unit bldFile="userlibandfileserver/fileserver/estart" mrp="userlibandfileserver/fileserver/estart/base_f32_estart.mrp"/>
+ </component>
+ <component id="domainmgr" name="Domain Manager" introduced="8.1b" purpose="mandatory">
+ <unit bldFile="userlibandfileserver/domainmgr/group" mrp="userlibandfileserver/domainmgr/group/base_domain.mrp"/>
+ </component>
+ </collection>
+ <collection id="filesystems" name="File Systems" level="framework">
+ <component id="romfs" name="ROM File System" filter="gt" purpose="optional" class="plugin">
+ <unit mrp="userlibandfileserver/fileserver/srom/base_f32_srom.mrp"/>
+ </component>
+ <component id="rofs" name="ROFS" filter="gt" purpose="optional" class="plugin">
+ <unit bldFile="userlibandfileserver/fileserver/srofs" mrp="userlibandfileserver/fileserver/srofs/base_f32_srofs.mrp"/>
+ </component>
+ <component id="usbmsfs" name="USB Mass Storage File System" filter="gt" purpose="optional" class="plugin">
+ <unit bldFile="userlibandfileserver/fileserver/smassstorage" mrp="userlibandfileserver/fileserver/smassstorage/base_f32_smassstorage.mrp"/>
+ </component>
+ <component id="usbhostmssrv" name="USB Host Mass Storage Server" filter="gt" introduced="^3" purpose="optional" class="plugin">
+ <unit bldFile="userlibandfileserver/fileserver/shostmassstorage" mrp="userlibandfileserver/fileserver/shostmassstorage/base_f32_shostmassstorage.mrp"/>
+ </component>
+ <component id="fat32fs" name="FAT32 File System" filter="gt" purpose="optional" class="plugin">
+ <unit bldFile="userlibandfileserver/fileserver/sfat32" mrp="userlibandfileserver/fileserver/sfat32/base_f32_sfat32.mrp"/>
+ </component>
+ <component id="fatfs" name="FAT File System" filter="gt" purpose="optional" class="plugin">
+ <unit bldFile="userlibandfileserver/fileserver/sfat" mrp="userlibandfileserver/fileserver/sfat/base_f32_sfat.mrp"/>
+ </component>
+ <component id="compfs" name="Composite File System" filter="gt" purpose="optional" class="plugin">
+ <unit bldFile="userlibandfileserver/fileserver/scomp" mrp="userlibandfileserver/fileserver/scomp/base_f32_scomp.mrp"/>
+ </component>
+ </collection>
+ <collection id="halservices" name="HAL Services" level="framework">
+ <component id="hal" name="User-Side Hardware Abstraction" introduced="6.0" purpose="optional">
+ <unit bldFile="halservices/hal" mrp="halservices/hal/base_hal.mrp"/>
+ </component>
+ </collection>
+ <collection id="textmodeshell" name="Text Mode Shell" level="test">
+ <component id="e32wsrv" name="Text Window Server" purpose="optional">
+ <unit bldFile="kernel/eka/ewsrv" mrp="kernel/eka/ewsrv/base_e32_ewsrv.mrp"/>
+ </component>
+ <component id="textshell" name="Text Shell" filter="gt" purpose="development">
+ <unit bldFile="userlibandfileserver/fileserver/etshell" mrp="userlibandfileserver/fileserver/etshell/base_f32_eshell.mrp"/>
+ </component>
+ </collection>
+ <collection id="baseapitest" name="Base API Tests" level="test">
+ <component id="basesvs" name="Base Verification Suite" introduced="^2" purpose="development" filter="test">
+ <unit mrp="baseapitest/basesvs/group/basesvs.mrp" bldFile="baseapitest/basesvs/group"/>
+ </component>
+ </collection>
+ <collection id="kernelhwsrv_info" name="Kernel and Hardware Services Info" level="test">
+ <component id="kernelhwsrv_metadata" name="Kernel and Hardware Services Metadata" class="config" introduced="^2" purpose="development" target="desktop">
+ <unit mrp="kernelhwsrv_info/kernelhwsrv_metadata/kernelhwsrv_metadata.mrp"/>
+ </component>
+ </collection>
+ </package>
+</SystemDefinition>
--- a/symbian3/os/lbs/package_definition.xml Fri Feb 12 16:37:22 2010 +0000
+++ b/symbian3/os/lbs/package_definition.xml Mon Feb 15 18:25:55 2010 +0000
@@ -1,184 +1,166 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE SystemDefinition [
- <!ELEMENT SystemDefinition (systemModel?,SystemBuild?)>
- <!ATTLIST SystemDefinition
- name CDATA #REQUIRED
- schema CDATA #REQUIRED>
- <!ELEMENT systemModel (layer+)>
- <!ELEMENT layer (block*|collection*)*>
- <!ATTLIST layer
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED
- levels NMTOKENS #IMPLIED
- span CDATA #IMPLIED>
- <!ELEMENT block (subblock*|collection*)*>
- <!ATTLIST block
- levels NMTOKENS #IMPLIED
- span CDATA #IMPLIED
- level NMTOKEN #IMPLIED
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED>
- <!ELEMENT subblock (collection)*>
- <!ATTLIST subblock
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED>
- <!ELEMENT collection (component)*>
- <!ATTLIST collection
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED
- level NMTOKEN #IMPLIED>
- <!ELEMENT component (unit)*>
- <!ATTLIST component
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED
- deprecated CDATA #IMPLIED
- introduced CDATA #IMPLIED
- contract CDATA #IMPLIED
- plugin (Y|N) 'N'
- filter CDATA #IMPLIED
- class NMTOKENS #IMPLIED
- supports CDATA #IMPLIED
- purpose (optional|mandatory|development) 'optional'>
- <!ELEMENT unit EMPTY>
- <!ATTLIST unit
- mrp CDATA #IMPLIED
- filter CDATA #IMPLIED
- bldFile CDATA #IMPLIED
- root CDATA #IMPLIED
- version NMTOKEN #IMPLIED
- prebuilt NMTOKEN #IMPLIED
- late (Y|N) #IMPLIED
- priority CDATA #IMPLIED>
- <!ELEMENT SystemBuild (option*|target+|targetList+|list+|configuration+)*>
- <!ATTLIST SystemBuild schema CDATA #REQUIRED>
- <!ELEMENT list (ref+)>
- <!ATTLIST list
- name ID #REQUIRED
- description CDATA #REQUIRED>
- <!ELEMENT ref EMPTY>
- <!ATTLIST ref item CDATA #REQUIRED>
- <!ELEMENT targetList EMPTY>
- <!ATTLIST targetList
- name ID #REQUIRED
- description CDATA #REQUIRED
- target IDREFS #REQUIRED>
- <!ELEMENT target EMPTY>
- <!ATTLIST target
- name ID #REQUIRED
- abldTarget CDATA #REQUIRED
- description CDATA #REQUIRED>
- <!ELEMENT option EMPTY>
- <!ATTLIST option
- name ID #REQUIRED
- abldOption CDATA #REQUIRED
- description CDATA #REQUIRED
- enable (Y|N) #REQUIRED>
- <!ELEMENT configuration (listRef+|ref+|task+)*>
- <!ATTLIST configuration
- name ID #REQUIRED
- description CDATA #REQUIRED
- filter CDATA #REQUIRED>
- <!ELEMENT task (listRef*,(buildLayer|specialInstructions))>
- <!ELEMENT listRef EMPTY>
- <!ATTLIST listRef list CDATA #REQUIRED>
- <!ELEMENT buildLayer EMPTY>
- <!ATTLIST buildLayer
- command CDATA #REQUIRED
- targetList IDREFS #IMPLIED
- unitParallel (Y|N) #REQUIRED
- targetParallel (Y|N) 'N'>
- <!ELEMENT specialInstructions EMPTY>
- <!ATTLIST specialInstructions
- name CDATA #REQUIRED
- cwd CDATA #REQUIRED
- root CDATA #IMPLIED
- command CDATA #REQUIRED>
-]>
-<SystemDefinition schema="2.0.1" name="Symbian^3">
-<systemModel>
-<layer name="os" long-name="OS" levels="hw services">
-<block name="lbs" level="services" long-name="Locating Services" levels="hw-if data-acquisition adaptation management application-interface">
-<collection name="datasourcemodules" long-name="Generic Positioning Plugins" level="data-acquisition">
-<component name="defaultpositioningmodule" long-name="Default Positioning Module" introduced="tb91" purpose="optional" plugin="Y">
-<unit bldFile="/sf/os/lbs/datasourcemodules/defaultpositioningmodule/group" mrp="/sf/os/lbs/datasourcemodules/defaultpositioningmodule/group/lbs_default_positioning_module.mrp"/>
-</component>
-<component name="bluetoothgpspositioningmodule" long-name="Bluetooth GPS Positioning Module" introduced="tb91" purpose="optional" plugin="Y">
-<unit bldFile="/sf/os/lbs/datasourcemodules/bluetoothgpspositioningmodule/group" mrp="/sf/os/lbs/datasourcemodules/bluetoothgpspositioningmodule/group/lbs_bt_positioning_module.mrp"/>
-</component>
-<component name="simulationpositioningmodule" long-name="Simulation Positioning Module" introduced="tb91" purpose="development" plugin="Y">
-<unit bldFile="/sf/os/lbs/datasourcemodules/simulationpositioningmodule/group" mrp="/sf/os/lbs/datasourcemodules/simulationpositioningmodule/group/lbs_simulation_positioning_module.mrp"/>
-</component>
-<component name="gpspositioningmodule" long-name="GPS/A-GPS Positioning Module" introduced="tb92" purpose="optional" plugin="Y">
-<unit bldFile="/sf/os/lbs/datasourcemodules/gpspositioningmodule/group" mrp="/sf/os/lbs/datasourcemodules/gpspositioningmodule/group/lbs_agps_positioning_module.mrp"/>
-</component>
-<component name="networkpositioningmodule" long-name="Network Positioning Module" introduced="tb92" purpose="optional" plugin="Y">
-<unit bldFile="/sf/os/lbs/datasourcemodules/networkpositioningmodule/group" mrp="/sf/os/lbs/datasourcemodules/networkpositioningmodule/group/lbs_network_positioning_module.mrp"/>
-</component>
-</collection>
-<collection name="datasourceadaptation" long-name="Data Source Adaptation" level="adaptation">
-<component name="gpsdatasourceadaptation" long-name="GPS Data Source Adaptation" introduced="tb91" purpose="optional" plugin="Y">
-<unit bldFile="/sf/os/lbs/datasourceadaptation/gpsdatasourceadaptation/group" mrp="/sf/os/lbs/datasourceadaptation/gpsdatasourceadaptation/group/lbs_gps_data_source_adaptation.mrp"/>
-</component>
-</collection>
-<collection name="locationrequestmgmt" long-name="Location Request Management" level="application-interface">
-<component name="locationserver" long-name="Location Server" introduced="9.2" purpose="optional">
-<unit bldFile="/sf/os/lbs/locationrequestmgmt/locationserver/group" mrp="/sf/os/lbs/locationrequestmgmt/locationserver/group/lbs_locationserver.mrp"/>
-</component>
-<component name="networkrequesthandler" long-name="Network Request Handler" introduced="9.2" purpose="optional">
-<unit bldFile="/sf/os/lbs/locationrequestmgmt/networkrequesthandler/group" mrp="/sf/os/lbs/locationrequestmgmt/networkrequesthandler/group/lbs_networkrequesthandler.mrp"/>
-</component>
-</collection>
-<collection name="lbstest" long-name="Locating Services Tests" level="application-interface">
-<component name="lbstestproduct" long-name="LBS Test Product" introduced="9.2" purpose="development">
-<unit mrp="/sf/os/lbs/lbstest/lbstestproduct/group/lbs_testproduct.mrp"/>
-</component>
-<component name="locationprotocoltest" long-name="Location Protocol Tests" introduced="9.2" purpose="development" plugin="Y">
-<unit bldFile="/sf/os/lbs/lbstest/locationprotocoltest/group" mrp="/sf/os/lbs/lbstest/locationprotocoltest/group/lbs_networktest.mrp"/>
-</component>
-</collection>
-<collection name="locationmgmt" long-name="Location Management" level="management">
-<component name="locmonitor" long-name="Location Monitor" introduced="tb92" purpose="optional">
-<unit bldFile="/sf/os/lbs/locationmgmt/locmonitor/lbslocmonitorserver/group" mrp="/sf/os/lbs/locationmgmt/locmonitor/lbslocmonitorserver/group/lbs_locationmonitor.mrp"/>
-</component>
-<component name="agpslocationmgr" long-name="A-GPS Location Manager" introduced="9.2" purpose="optional">
-<unit bldFile="/sf/os/lbs/locationmgmt/agpslocationmgr/group" mrp="/sf/os/lbs/locationmgmt/agpslocationmgr/group/lbs_agpslocationmanager.mrp"/>
-</component>
-<component name="networklocationmgr" long-name="Network Location Manager" introduced="9.2" purpose="optional">
-<unit bldFile="/sf/os/lbs/locationmgmt/networklocationmgr/group" mrp="/sf/os/lbs/locationmgmt/networklocationmgr/group/lbs_networklocationmanager.mrp"/>
-</component>
-<component name="locationcore" long-name="Location Core" introduced="9.2" purpose="optional">
-<unit bldFile="/sf/os/lbs/locationmgmt/locationcore/group" mrp="/sf/os/lbs/locationmgmt/locationcore/group/lbs_admin.mrp"/>
-</component>
-<component name="networkgateway" long-name="Network Gateway" introduced="9.2" purpose="optional">
-<unit bldFile="/sf/os/lbs/locationmgmt/networkgateway/group" mrp="/sf/os/lbs/locationmgmt/networkgateway/group/lbs_networkgateway.mrp"/>
-</component>
-</collection>
-<collection name="networkprotocolmodules" long-name="Network Protocol Modules" level="adaptation">
-<component name="privacyprotocolmodule" long-name="Privacy Protocol Module" introduced="tb91" purpose="optional" plugin="Y">
-<unit bldFile="/sf/os/lbs/networkprotocolmodules/privacyprotocolmodule/group" mrp="/sf/os/lbs/networkprotocolmodules/privacyprotocolmodule/group/lbs_privacyprotocolmodule.mrp"/>
-</component>
-<component name="suplproxyprotocolmodule" long-name="SUPL Proxy Protocol Module" introduced="tb92" purpose="optional" plugin="Y" class="placeholder">
-<!-- PLACEHOLDER="DS.1806"
- <unit bldFile="networkprotocolmodules/suplproxyprotocolmodule/group" mrp="networkprotocolmodules/suplproxyprotocolmodule/group/lbs_suplproxyprotocolmodule.mrp"/>
- -->
-</component>
-</collection>
-<collection name="lbsapitest" long-name="Location API Tests" level="application-interface">
-<component name="lbshaitest" long-name="Location HAI Tests" introduced="tb91" purpose="development">
-<unit mrp="/sf/os/lbs/lbsapitest/lbshaitest/group/lbshaitest.mrp"/>
-</component>
-</collection>
-<collection name="lbs_info" long-name="Locating Services Info" level="application-interface">
-<component name="lbs_metadata" long-name="Locating Services Metadata" introduced="tb91" purpose="development" class="config PC">
-<unit mrp="/sf/os/lbs/lbs_info/lbs_metadata/lbs_metadata.mrp"/>
-</component>
-</collection>
-<collection name="s60">
-<component name="lodo.lbs">
-<unit bldFile="/sf/os/lbs/group" mrp=""/>
-</component>
-</collection>
-</block>
-</layer>
-</systemModel>
-</SystemDefinition>
\ No newline at end of file
+<!DOCTYPE SystemDefinition [
+<!ELEMENT SystemDefinition ( systemModel )>
+<!ATTLIST SystemDefinition
+ name CDATA #REQUIRED
+ schema CDATA #REQUIRED
+>
+<!-- all paths are relative to the environment variable specified by the root attribute, or SOURCEROOT if not. -->
+
+<!-- System Model Section of DTD -->
+<!ELEMENT systemModel (layer+)>
+
+<!ELEMENT layer (block* | collection*)*>
+<!-- Kernel Services, Base Services, OS Services, Etc -->
+<!ATTLIST layer
+ name CDATA #REQUIRED
+ long-name CDATA #IMPLIED
+ levels NMTOKENS #IMPLIED
+ span CDATA #IMPLIED
+>
+
+<!ELEMENT block (subblock* | collection*)*>
+ <!-- Generic OS services, Comms Services, etc -->
+<!ATTLIST block
+ levels NMTOKENS #IMPLIED
+ span CDATA #IMPLIED
+ level NMTOKEN #IMPLIED
+ name CDATA #REQUIRED
+ long-name CDATA #IMPLIED
+>
+
+<!ELEMENT subblock (collection)*>
+<!-- Cellular Baseband Services, Networking Services, etc -->
+<!ATTLIST subblock
+ name CDATA #REQUIRED
+ long-name CDATA #IMPLIED
+>
+
+<!ELEMENT collection (component)*>
+<!-- Screen Driver, Content Handling, etc -->
+<!ATTLIST collection
+ name CDATA #REQUIRED
+ long-name CDATA #IMPLIED
+ level NMTOKEN #IMPLIED
+>
+
+<!ELEMENT component (unit)*>
+<!-- contains units or is a package or prebuilt -->
+<!ATTLIST component
+ name CDATA #REQUIRED
+ long-name CDATA #IMPLIED
+ deprecated CDATA #IMPLIED
+ introduced CDATA #IMPLIED
+ contract CDATA #IMPLIED
+ plugin (Y|N) "N"
+ filter CDATA #IMPLIED
+ class NMTOKENS #IMPLIED
+ supports CDATA #IMPLIED
+ purpose ( optional | mandatory | development ) "optional"
+>
+
+<!ELEMENT unit EMPTY >
+<!-- must be buildable (bld.inf) -->
+<!-- bldFile may someday be removed in favour of mrp -->
+<!ATTLIST unit
+ mrp CDATA #IMPLIED
+ filter CDATA #IMPLIED
+ bldFile CDATA #IMPLIED
+ root CDATA #IMPLIED
+ version NMTOKEN #IMPLIED
+ prebuilt NMTOKEN #IMPLIED
+ late (Y|N) #IMPLIED
+ priority CDATA #IMPLIED
+>
+]>
+<SystemDefinition name="Symbian^3" schema="2.0.1">
+ <systemModel>
+ <layer name="os" long-name="OS" levels="hw services">
+ <block name="lbs" level="services" long-name="Locating Services" levels="hw-if data-acquisition adaptation management application-interface">
+ <collection name="datasourcemodules" long-name="Generic Positioning Plugins" level="data-acquisition">
+ <component name="defaultpositioningmodule" long-name="Default Positioning Module" introduced="^2" purpose="optional" plugin="Y">
+ <unit bldFile="/sf/os/lbs/datasourcemodules/defaultpositioningmodule/group" mrp="/sf/os/lbs/datasourcemodules/defaultpositioningmodule/group/lbs_default_positioning_module.mrp"/>
+ </component>
+ <component name="bluetoothgpspositioningmodule" long-name="Bluetooth GPS Positioning Module" introduced="^2" purpose="optional" plugin="Y">
+ <unit bldFile="/sf/os/lbs/datasourcemodules/bluetoothgpspositioningmodule/group" mrp="/sf/os/lbs/datasourcemodules/bluetoothgpspositioningmodule/group/lbs_bt_positioning_module.mrp"/>
+ </component>
+ <component name="simulationpositioningmodule" long-name="Simulation Positioning Module" introduced="^2" purpose="development" plugin="Y">
+ <unit bldFile="/sf/os/lbs/datasourcemodules/simulationpositioningmodule/group" mrp="/sf/os/lbs/datasourcemodules/simulationpositioningmodule/group/lbs_simulation_positioning_module.mrp"/>
+ </component>
+ <component name="gpspositioningmodule" long-name="GPS/A-GPS Positioning Module" introduced="^3" purpose="optional" plugin="Y">
+ <unit bldFile="/sf/os/lbs/datasourcemodules/gpspositioningmodule/group" mrp="/sf/os/lbs/datasourcemodules/gpspositioningmodule/group/lbs_agps_positioning_module.mrp"/>
+ </component>
+ <component name="networkpositioningmodule" long-name="Network Positioning Module" introduced="^3" purpose="optional" plugin="Y">
+ <unit bldFile="/sf/os/lbs/datasourcemodules/networkpositioningmodule/group" mrp="/sf/os/lbs/datasourcemodules/networkpositioningmodule/group/lbs_network_positioning_module.mrp"/>
+ </component>
+ <component name="locationapesuplpsy" long-name="APE SUPL PSY" introduced="^3" purpose="optional" filter="s60" plugin="Y">
+ <unit bldFile="/sf/os/lbs/datasourcemodules/locationapesuplpsy/group"/>
+ </component>
+ <component name="npeintegmodule" long-name="NPE Integration Module" introduced="^3" purpose="optional" plugin="Y">
+ <unit bldFile="/sf/os/lbs/datasourcemodules/npeintegmodule/group" mrp="/sf/os/lbs/datasourcemodules/npeintegmodule/group/lbs_npeintegrationmodule.mrp"/>
+ </component>
+ <component name="datasourcemodules_build" long-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="/sf/os/lbs/datasourcemodules/group"/>
+ </component>
+ </collection>
+ <collection name="datasourceadaptation" long-name="Data Source Adaptation" level="adaptation">
+ <component name="gpsdatasourceadaptation" long-name="GPS Data Source Adaptation" introduced="^2" purpose="optional" plugin="Y">
+ <unit bldFile="/sf/os/lbs/datasourceadaptation/gpsdatasourceadaptation/group" mrp="/sf/os/lbs/datasourceadaptation/gpsdatasourceadaptation/group/lbs_gps_data_source_adaptation.mrp"/>
+ </component>
+ </collection>
+ <collection name="locationrequestmgmt" long-name="Location Request Management" level="application-interface">
+ <component name="locationserver" long-name="Location Server" introduced="9.2" purpose="optional">
+ <unit bldFile="/sf/os/lbs/locationrequestmgmt/locationserver/group" mrp="/sf/os/lbs/locationrequestmgmt/locationserver/group/lbs_locationserver.mrp"/>
+ </component>
+ <component name="networkrequesthandler" long-name="Network Request Handler" introduced="9.2" purpose="optional">
+ <unit bldFile="/sf/os/lbs/locationrequestmgmt/networkrequesthandler/group" mrp="/sf/os/lbs/locationrequestmgmt/networkrequesthandler/group/lbs_networkrequesthandler.mrp"/>
+ </component>
+ </collection>
+ <collection name="lbstest" long-name="Locating Services Tests" level="application-interface">
+ <component name="lbstestproduct" long-name="LBS Test Product" introduced="9.2" purpose="development" filter="test">
+ <unit mrp="/sf/os/lbs/lbstest/lbstestproduct/group/lbs_testproduct.mrp" bldFile="/sf/os/lbs/lbstest/lbstestproduct/group"/>
+ </component>
+ <component name="locationprotocoltest" long-name="Location Protocol Tests" introduced="9.2" purpose="development" plugin="Y">
+ <unit bldFile="/sf/os/lbs/lbstest/locationprotocoltest/group" mrp="/sf/os/lbs/lbstest/locationprotocoltest/group/lbs_networktest.mrp"/>
+ </component>
+ </collection>
+ <collection name="locationmgmt" long-name="Location Management" level="management">
+ <component name="locmonitor" long-name="Location Monitor" introduced="^3" purpose="optional">
+ <unit bldFile="/sf/os/lbs/locationmgmt/locmonitor/lbslocmonitorserver/group" mrp="/sf/os/lbs/locationmgmt/locmonitor/lbslocmonitorserver/group/lbs_locationmonitor.mrp"/>
+ </component>
+ <component name="agpslocationmgr" long-name="A-GPS Location Manager" introduced="9.2" purpose="optional">
+ <unit bldFile="/sf/os/lbs/locationmgmt/agpslocationmgr/group" mrp="/sf/os/lbs/locationmgmt/agpslocationmgr/group/lbs_agpslocationmanager.mrp"/>
+ </component>
+ <component name="networklocationmgr" long-name="Network Location Manager" introduced="9.2" purpose="optional">
+ <unit bldFile="/sf/os/lbs/locationmgmt/networklocationmgr/group" mrp="/sf/os/lbs/locationmgmt/networklocationmgr/group/lbs_networklocationmanager.mrp"/>
+ </component>
+ <component name="locationcore" long-name="Location Core" introduced="9.2" purpose="optional">
+ <unit bldFile="/sf/os/lbs/locationmgmt/locationcore/group" mrp="/sf/os/lbs/locationmgmt/locationcore/group/lbs_admin.mrp"/>
+ </component>
+ <component name="networkgateway" long-name="Network Gateway" introduced="9.2" purpose="optional">
+ <unit bldFile="/sf/os/lbs/locationmgmt/networkgateway/group" mrp="/sf/os/lbs/locationmgmt/networkgateway/group/lbs_networkgateway.mrp"/>
+ </component>
+ </collection>
+ <collection name="networkprotocolmodules" long-name="Network Protocol Modules" level="adaptation">
+ <component name="privacyprotocolmodule" long-name="Privacy Protocol Module" introduced="^2" purpose="optional" plugin="Y">
+ <unit bldFile="/sf/os/lbs/networkprotocolmodules/privacyprotocolmodule/group" mrp="/sf/os/lbs/networkprotocolmodules/privacyprotocolmodule/group/lbs_privacyprotocolmodule.mrp"/>
+ </component>
+ <component name="suplproxyprotocolmodule" long-name="SUPL Proxy Protocol Module" introduced="^3" purpose="optional" plugin="Y">
+ <unit bldFile="/sf/os/lbs/networkprotocolmodules/suplproxyprotocolmodule/group" mrp="/sf/os/lbs/networkprotocolmodules/suplproxyprotocolmodule/group/lbs_suplproxyprotocolmodule.mrp"/>
+ </component>
+ </collection>
+ <collection name="lbsapitest" long-name="Location API Tests" level="application-interface">
+ <component name="lbshaitest" long-name="Location HAI Tests" introduced="^2" purpose="development" filter="test">
+ <unit mrp="/sf/os/lbs/lbsapitest/lbshaitest/group/lbshaitest.mrp" bldFile="/sf/os/lbs/lbsapitest/lbshaitest/group"/>
+ </component>
+ </collection>
+ <collection name="lbs_info" long-name="Locating Services Info" level="application-interface">
+ <component name="lbs_metadata" long-name="Locating Services Metadata" introduced="^2" purpose="development" class="config PC">
+ <unit mrp="/sf/os/lbs/lbs_info/lbs_metadata/lbs_metadata.mrp"/>
+ </component>
+ </collection>
+ </block>
+ </layer>
+ </systemModel>
+</SystemDefinition>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/symbian3/os/lbs/package_definition_3.0.xml Mon Feb 15 18:25:55 2010 +0000
@@ -0,0 +1,88 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<SystemDefinition schema="3.0.0">
+ <package id="lbs" name="Locating Services" levels="hw-if data-acquisition adaptation management application-interface">
+ <collection id="datasourcemodules" name="Generic Positioning Plugins" level="data-acquisition">
+ <component id="defaultpositioningmodule" name="Default Positioning Module" introduced="^2" purpose="optional" class="plugin">
+ <unit bldFile="datasourcemodules/defaultpositioningmodule/group" mrp="datasourcemodules/defaultpositioningmodule/group/lbs_default_positioning_module.mrp"/>
+ </component>
+ <component id="bluetoothgpspositioningmodule" name="Bluetooth GPS Positioning Module" introduced="^2" purpose="optional" class="plugin">
+ <unit bldFile="datasourcemodules/bluetoothgpspositioningmodule/group" mrp="datasourcemodules/bluetoothgpspositioningmodule/group/lbs_bt_positioning_module.mrp"/>
+ </component>
+ <component id="simulationpositioningmodule" name="Simulation Positioning Module" introduced="^2" purpose="development" class="plugin">
+ <unit bldFile="datasourcemodules/simulationpositioningmodule/group" mrp="datasourcemodules/simulationpositioningmodule/group/lbs_simulation_positioning_module.mrp"/>
+ </component>
+ <component id="gpspositioningmodule" name="GPS/A-GPS Positioning Module" introduced="^3" purpose="optional" class="plugin">
+ <unit bldFile="datasourcemodules/gpspositioningmodule/group" mrp="datasourcemodules/gpspositioningmodule/group/lbs_agps_positioning_module.mrp"/>
+ </component>
+ <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">
+ <unit bldFile="datasourceadaptation/gpsdatasourceadaptation/group" mrp="datasourceadaptation/gpsdatasourceadaptation/group/lbs_gps_data_source_adaptation.mrp"/>
+ </component>
+ </collection>
+ <collection id="locationrequestmgmt" name="Location Request Management" level="application-interface">
+ <component id="locationserver" name="Location Server" introduced="9.2" purpose="optional">
+ <unit bldFile="locationrequestmgmt/locationserver/group" mrp="locationrequestmgmt/locationserver/group/lbs_locationserver.mrp"/>
+ </component>
+ <component id="networkrequesthandler" name="Network Request Handler" introduced="9.2" purpose="optional">
+ <unit bldFile="locationrequestmgmt/networkrequesthandler/group" mrp="locationrequestmgmt/networkrequesthandler/group/lbs_networkrequesthandler.mrp"/>
+ </component>
+ </collection>
+ <collection id="lbstest" name="Locating Services Tests" level="application-interface">
+ <component id="lbstestproduct" name="LBS Test Product" introduced="9.2" purpose="development" filter="test">
+ <unit mrp="lbstest/lbstestproduct/group/lbs_testproduct.mrp" bldFile="lbstest/lbstestproduct/group"/>
+ </component>
+ <component id="locationprotocoltest" name="Location Protocol Tests" introduced="9.2" purpose="development" class="plugin">
+ <unit bldFile="lbstest/locationprotocoltest/group" mrp="lbstest/locationprotocoltest/group/lbs_networktest.mrp"/>
+ </component>
+ </collection>
+ <collection id="locationmgmt" name="Location Management" level="management">
+ <component id="locmonitor" name="Location Monitor" introduced="^3" purpose="optional">
+ <unit bldFile="locationmgmt/locmonitor/lbslocmonitorserver/group" mrp="locationmgmt/locmonitor/lbslocmonitorserver/group/lbs_locationmonitor.mrp"/>
+ </component>
+ <component id="agpslocationmgr" name="A-GPS Location Manager" introduced="9.2" purpose="optional">
+ <unit bldFile="locationmgmt/agpslocationmgr/group" mrp="locationmgmt/agpslocationmgr/group/lbs_agpslocationmanager.mrp"/>
+ </component>
+ <component id="networklocationmgr" name="Network Location Manager" introduced="9.2" purpose="optional">
+ <unit bldFile="locationmgmt/networklocationmgr/group" mrp="locationmgmt/networklocationmgr/group/lbs_networklocationmanager.mrp"/>
+ </component>
+ <component id="locationcore" name="Location Core" introduced="9.2" purpose="optional">
+ <unit bldFile="locationmgmt/locationcore/group" mrp="locationmgmt/locationcore/group/lbs_admin.mrp"/>
+ </component>
+ <component id="networkgateway" name="Network Gateway" introduced="9.2" purpose="optional">
+ <unit bldFile="locationmgmt/networkgateway/group" mrp="locationmgmt/networkgateway/group/lbs_networkgateway.mrp"/>
+ </component>
+ </collection>
+ <collection id="networkprotocolmodules" name="Network Protocol Modules" level="adaptation">
+ <component id="privacyprotocolmodule" name="Privacy Protocol Module" introduced="^2" purpose="optional" class="plugin">
+ <unit bldFile="networkprotocolmodules/privacyprotocolmodule/group" mrp="networkprotocolmodules/privacyprotocolmodule/group/lbs_privacyprotocolmodule.mrp"/>
+ </component>
+ <component id="suplproxyprotocolmodule" name="SUPL Proxy Protocol Module" introduced="^3" purpose="optional" class="plugin">
+ <unit bldFile="networkprotocolmodules/suplproxyprotocolmodule/group" mrp="networkprotocolmodules/suplproxyprotocolmodule/group/lbs_suplproxyprotocolmodule.mrp"/>
+ </component>
+ </collection>
+ <collection id="lbsapitest" name="Location API Tests" level="application-interface">
+ <component id="lbshaitest" name="Location HAI Tests" introduced="^2" purpose="development" filter="test">
+ <unit mrp="lbsapitest/lbshaitest/group/lbshaitest.mrp" bldFile="lbsapitest/lbshaitest/group"/>
+ </component>
+ </collection>
+ <collection id="lbs_info" name="Locating Services Info" level="application-interface">
+ <component id="lbs_metadata" name="Locating Services Metadata" class="config" introduced="^2" purpose="development" target="desktop">
+ <unit mrp="lbs_info/lbs_metadata/lbs_metadata.mrp"/>
+ </component>
+ </collection>
+ </package>
+</SystemDefinition>
--- a/symbian3/os/mm/package_definition.xml Fri Feb 12 16:37:22 2010 +0000
+++ b/symbian3/os/mm/package_definition.xml Mon Feb 15 18:25:55 2010 +0000
@@ -1,356 +1,329 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE SystemDefinition [
- <!ELEMENT SystemDefinition (systemModel?,SystemBuild?)>
- <!ATTLIST SystemDefinition
- name CDATA #REQUIRED
- schema CDATA #REQUIRED>
- <!ELEMENT systemModel (layer+)>
- <!ELEMENT layer (block*|collection*)*>
- <!ATTLIST layer
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED
- levels NMTOKENS #IMPLIED
- span CDATA #IMPLIED>
- <!ELEMENT block (subblock*|collection*)*>
- <!ATTLIST block
- levels NMTOKENS #IMPLIED
- span CDATA #IMPLIED
- level NMTOKEN #IMPLIED
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED>
- <!ELEMENT subblock (collection)*>
- <!ATTLIST subblock
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED>
- <!ELEMENT collection (component)*>
- <!ATTLIST collection
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED
- level NMTOKEN #IMPLIED>
- <!ELEMENT component (unit)*>
- <!ATTLIST component
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED
- deprecated CDATA #IMPLIED
- introduced CDATA #IMPLIED
- contract CDATA #IMPLIED
- plugin (Y|N) 'N'
- filter CDATA #IMPLIED
- class NMTOKENS #IMPLIED
- supports CDATA #IMPLIED
- purpose (optional|mandatory|development) 'optional'>
- <!ELEMENT unit EMPTY>
- <!ATTLIST unit
- mrp CDATA #IMPLIED
- filter CDATA #IMPLIED
- bldFile CDATA #IMPLIED
- root CDATA #IMPLIED
- version NMTOKEN #IMPLIED
- prebuilt NMTOKEN #IMPLIED
- late (Y|N) #IMPLIED
- priority CDATA #IMPLIED>
- <!ELEMENT SystemBuild (option*|target+|targetList+|list+|configuration+)*>
- <!ATTLIST SystemBuild schema CDATA #REQUIRED>
- <!ELEMENT list (ref+)>
- <!ATTLIST list
- name ID #REQUIRED
- description CDATA #REQUIRED>
- <!ELEMENT ref EMPTY>
- <!ATTLIST ref item CDATA #REQUIRED>
- <!ELEMENT targetList EMPTY>
- <!ATTLIST targetList
- name ID #REQUIRED
- description CDATA #REQUIRED
- target IDREFS #REQUIRED>
- <!ELEMENT target EMPTY>
- <!ATTLIST target
- name ID #REQUIRED
- abldTarget CDATA #REQUIRED
- description CDATA #REQUIRED>
- <!ELEMENT option EMPTY>
- <!ATTLIST option
- name ID #REQUIRED
- abldOption CDATA #REQUIRED
- description CDATA #REQUIRED
- enable (Y|N) #REQUIRED>
- <!ELEMENT configuration (listRef+|ref+|task+)*>
- <!ATTLIST configuration
- name ID #REQUIRED
- description CDATA #REQUIRED
- filter CDATA #REQUIRED>
- <!ELEMENT task (listRef*,(buildLayer|specialInstructions))>
- <!ELEMENT listRef EMPTY>
- <!ATTLIST listRef list CDATA #REQUIRED>
- <!ELEMENT buildLayer EMPTY>
- <!ATTLIST buildLayer
- command CDATA #REQUIRED
- targetList IDREFS #IMPLIED
- unitParallel (Y|N) #REQUIRED
- targetParallel (Y|N) 'N'>
- <!ELEMENT specialInstructions EMPTY>
- <!ATTLIST specialInstructions
- name CDATA #REQUIRED
- cwd CDATA #REQUIRED
- root CDATA #IMPLIED
- command CDATA #REQUIRED>
-]>
-<SystemDefinition schema="2.0.1" name="Symbian^3">
-<systemModel>
-<layer name="os" long-name="OS" levels="hw services">
-<block name="mm" level="services" long-name="Multimedia" levels="adaptation hw-if device-fw devices middleware app-if">
-<collection name="imagingandcamerafws" long-name="Imaging and Camera Frameworks" level="app-if">
-<component name="imagingfws" long-name="Imaging Frameworks" introduced="7.0s" purpose="mandatory">
-<unit bldFile="/sf/os/mm/imagingandcamerafws/imagingfws/group" mrp="/sf/os/mm/imagingandcamerafws/imagingfws/group/multimedia_icl.mrp"/>
-</component>
-<component name="imagingunittest" long-name="Imaging Unit Tests" introduced="7.0s" purpose="development">
-<unit mrp="/sf/os/mm/imagingandcamerafws/imagingunittest/group/multimedia_unittest_icl_source.mrp"/>
-</component>
-<component name="imaginginttest" long-name="Imaging Integration Tests" introduced="7.0s" purpose="development">
-<unit mrp="/sf/os/mm/imagingandcamerafws/imaginginttest/group/multimedia_inttest_icl_source.mrp"/>
-</component>
-<component name="camerafw" long-name="Camera Framework" introduced="7.0s" purpose="optional">
-<unit bldFile="/sf/os/mm/imagingandcamerafws/camerafw/group" mrp="/sf/os/mm/imagingandcamerafws/camerafw/group/multimedia_ecam_framework.mrp"/>
-</component>
-<component name="cameraunittest" long-name="Camera Unit Tests" introduced="9.2" purpose="development">
-<unit mrp="/sf/os/mm/imagingandcamerafws/cameraunittest/group/multimedia_unittest_ecam_source.mrp"/>
-</component>
-</collection>
-<collection name="mmlibs" long-name="Multimedia Libraries" level="middleware">
-<component name="mmutilitylib" long-name="Multimedia Utility Library" introduced="8.1" purpose="mandatory">
-<!-- PLACEHOLDER="DEF137894" START REMOVE -->
-<unit bldFile="/sf/mw/mmmw/mmmiddlewarefws/mmutilitylib/group" mrp="/sf/mw/mmmw/mmmiddlewarefws/mmutilitylib/group/multimedia_common.mrp"/>
-<!-- PLACEHOLDER="DEF137894" END REMOVE -->
-<!-- PLACEHOLDER="DEF137894"
- <unit bldFile="mmlibs/mmutilitylib/group" mrp="mmlibs/mmutilitylib/group/multimedia_common.mrp"/>
- -->
-</component>
-</collection>
-<collection name="mmplugins" long-name="Multimedia Plugins" level="middleware">
-<component name="imagingplugins" long-name="Imaging Plugins" introduced="7.0s" purpose="optional" plugin="Y">
-<unit bldFile="/sf/os/mm/imagingandcamerafws/imagingfws/plugins/group" mrp="/sf/os/mm/imagingandcamerafws/imagingfws/plugins/group/multimedia_icl_plugin.mrp"/>
-</component>
-<component name="cameraplugins" long-name="Camera Plugins" introduced="7.0s" purpose="optional" plugin="Y">
-<unit bldFile="/sf/os/mm/mmplugins/cameraplugins/group" mrp="/sf/os/mm/mmplugins/cameraplugins/group/multimedia_ecam_plugins.mrp"/>
-</component>
-<component name="lib3gp" long-name="3GP Library" introduced="tb91" purpose="optional">
-<unit bldFile="/sf/os/mm/mmplugins/lib3gp/group" mrp="/sf/os/mm/mmplugins/lib3gp/group/multimedia_3gplibrary.mrp"/>
-</component>
-<component name="lib3gpunittest" long-name="3GP Unit Tests" introduced="tb91" purpose="development">
-<unit mrp="/sf/os/mm/mmplugins/lib3gpunittest/group/multimedia_unittest_3gplibrary_source.mrp"/>
-</component>
-</collection>
-<collection name="mm_info" long-name="Multimedia Info" level="app-if">
-<component name="mmdocs" long-name="Multimedia Documentation" purpose="development" class="doc">
-<unit mrp="/sf/os/mm/mm_info/mmdocs/multimedia_documentation.mrp"/>
-</component>
-<component name="mm_metadata" long-name="Multimedia Metadata" introduced="tb91" purpose="development" class="config PC">
-<unit mrp="/sf/os/mm/mm_info/mm_metadata/mm_metadata.mrp"/>
-</component>
-</collection>
-<collection name="mmresourcemgmt" long-name="Multimedia Resource Management" level="middleware">
-<component name="mmresctrl" long-name="Multimedia Resource Controller" introduced="tb91" purpose="development">
-<unit bldFile="/sf/os/mm/mmresourcemgmt/mmresctrl/group" mrp="/sf/os/mm/mmresourcemgmt/mmresctrl/group/multimedia_a3f_refmmrc.mrp"/>
-</component>
-<!-- decsionfw is not used in any active configuration yet
- <component id="decisionfw" name="Decision Framework" introduced="Future" purpose="optional">
- <unit bldFile="mmresourcemgmt/decisionfw/group" mrp="mmresourcemgmt/decisionfw/group/multimedia_mmrcfw.mrp"/>
- </component>
- -->
-<!-- mmgmtengine in not used in any active configuration yet
- <component id="mmmgmtengine" name="Multimedia Management Engine" introduced="Future" purpose="optional">
- <unit bldFile="mmresourcemgmt/mmmgmtengine/group" mrp="mmresourcemgmt/mmmgmtengine/group/multimedia_mgtengine.mrp"/>
- </component>
- -->
-</collection>
-<collection name="mmdevicefw" long-name="Multimedia Device Framework" level="device-fw">
-<component name="mdf" long-name="Media Device Framework" introduced="9.2" purpose="mandatory">
-<unit bldFile="/sf/os/mm/mmdevicefw/mdf/group" mrp="/sf/os/mm/mmdevicefw/mdf/group/multimedia_mdf.mrp"/>
-</component>
-<!-- mdf2 is not used in any active configuration yet
- <component id="mdf2" name="Media Device Framework 2" introduced="Future" purpose="optional">
- <unit bldFile="mmdevicefw/mdf2/group" mrp="mmdevicefw/mdf2/group/multimedia_mm-infras.mrp"/>
- </component>
- -->
-<component name="mdfunittest" long-name="MDF Unit Tests" introduced="9.2" purpose="development">
-<unit mrp="/sf/os/mm/mmdevicefw/mdfunittest/group/multimedia_unittest_mdf_source.mrp"/>
-</component>
-<component name="asrcontroller" long-name="Speech Recognition Controller" introduced="7.0s" purpose="mandatory">
-<unit bldFile="/sf/mw/mmmw/mmmiddlewarefws/mmfw/ASR/group" mrp="/sf/mw/mmmw/mmmiddlewarefws/mmfw/ASR/group/multimedia_mmf_ASR.mrp"/>
-</component>
-</collection>
-<collection name="mmswadaptation" long-name="Multimedia Software Adaptation" level="adaptation">
-<component name="videorenderer" long-name="Video Renderer" introduced="tb92" purpose="optional">
-<unit bldFile="/sf/os/mm/mmswadaptation/videorenderer/group" mrp="/sf/os/mm/mmswadaptation/videorenderer/group/multimedia_videorenderer.mrp"/>
-</component>
-</collection>
-<collection name="mmtestenv" long-name="Multimedia Test Environment" level="device-fw">
-<component name="mmtestfw" long-name="Multimedia Test Framework" introduced="7.0s" purpose="development">
-<unit mrp="/sf/os/mm/mmtestenv/mmtestfw/group/multimedia_testframework_source.mrp"/>
-</component>
-<component name="mmtestfwunittest" long-name="Multimedia Test Framework Unit Tests" introduced="7.0s" purpose="development">
-<unit mrp="/sf/os/mm/mmtestenv/mmtestfwunittest/group/multimedia_unittest_testframework_source.mrp"/>
-</component>
-<component name="mmtestagent" long-name="Multimedia Test Agent" introduced="8.0" purpose="development">
-<unit mrp="/sf/os/mm/mmtestenv/mmtestagent/group/multimediatestagent_source.mrp"/>
-</component>
-<component name="mmtesttools" long-name="Multimedia Test Tools" purpose="development">
-<unit mrp="/sf/os/mm/mmtestenv/mmtesttools/Group/multimedia_testtools_source.mrp"/>
-</component>
-</collection>
-<collection name="omxil" long-name="OpenMAX IL" level="hw-if">
-<component name="omxilapi" long-name="OpenMAX IL API" introduced="tb92" purpose="optional">
-<unit bldFile="/sf/os/mm/omxil/omxilapi/group" mrp="/sf/os/mm/omxil/omxilapi/group/multimedia_omx_il_api.mrp" version="1"/>
-<!-- not used in an active conifguration
- <unit version="2" bldFile="omxil/omxilapi2/group" mrp="omxil/omxilapi2/group/multimedia_omx_il_api.mrp"/>
- -->
-</component>
-<component name="omxilcore" long-name="OpenMAX IL Core" introduced="tb92" purpose="optional">
-<unit bldFile="/sf/os/mm/omxil/omxilcore/group" mrp="/sf/os/mm/omxil/omxilcore/group/multimedia_omx_il_core.mrp" version="1"/>
-<!-- not used in an active conifguration
- <unit version="2" bldFile="omxil/omxilcore2/group" mrp="omxil/omxilcore2/group/multimedia_omx_il_core.mrp"/>
- -->
-</component>
-<!-- not used in an active conifguration
- <component id="omxilcompfw" name="OpenMAX IL Component Framework" introduced="Future" purpose="optional">
- <unit bldFile="omxil/omxilcompfw/components/group" mrp="omxil/omxilcompfw/components/group/multimedia_omx_il_comp.mrp"/>
- </component>
- -->
-<component name="omxilrefcomps" long-name="OpenMAX IL Reference Components" introduced="tb92" purpose="optional">
-<unit bldFile="/sf/os/mm/omxil/omxilrefcomps/ref_components/group" mrp="/sf/os/mm/omxil/omxilrefcomps/ref_components/group/multimedia_omx_il_comp_ref.mrp" version="1"/>
-<!-- not used in an active conifguration
- <unit version="2" bldFile="mmdataplane/omxiltranslators/group_omx_ref_components" mrp="mmdataplane/omxiltranslators/group_omx_ref_components/multimedia_omx_il_comp_ref.mrp"/>
- -->
-</component>
-<component name="omxilunittest" long-name="OpenMAX IL Unit Tests" introduced="tb92" purpose="development">
-<unit mrp="/sf/os/mm/omxil/omxilunittest/group/multimedia_unittest_omx_il.mrp"/>
-</component>
-<component name="omxilcoreconftest" long-name="OpenMAX IL Core Conformance Suite" introduced="tb92" purpose="development">
-<unit mrp="/sf/os/mm/omxil/omxilcoreconftest/group/multimedia_omx_il_core_loader_conf_suite.mrp"/>
-</component>
-<component name="mmilapi" long-name="Multimedia Integration Layer API" introduced="tb92" purpose="development">
-<unit bldFile="/sf/os/mm/omxil/mmilapi/group" mrp="/sf/os/mm/omxil/mmilapi/group/multimedia_il_api.mrp"/>
-</component>
-</collection>
-<collection name="devsound" long-name="Sound Device" level="devices">
-<component name="devsoundapi" long-name="DevSound API" introduced="7.0s" purpose="mandatory">
-<!-- PLACEHOLDER="DEF137592" START REMOVE -->
-<unit bldFile="/sf/mw/mmmw/mmmiddlewarefws/mmfw/SoundDev/group_api" mrp="/sf/mw/mmmw/mmmiddlewarefws/mmfw/SoundDev/group_api/multimedia_mdf_devsound_api.mrp"/>
-<!-- PLACEHOLDER="DEF137592" END REMOVE -->
-<!-- PLACEHOLDER="DEF137592"
- <unit bldFile="devsound/devsoundapi/group" mrp="devsound/devsoundapi/group/multimedia_mdf_devsound_api.mrp"/>
- -->
-</component>
-<component name="a3fdevsound" long-name="A3F DevSound" introduced="tb91" purpose="optional">
-<unit bldFile="/sf/os/mm/devsound/a3fdevsound/group" mrp="/sf/os/mm/devsound/a3fdevsound/group/multimedia_a3f_devsound.mrp"/>
-</component>
-<component name="a3facf" long-name="A3F Audio Component Framework" introduced="tb91" purpose="optional">
-<unit bldFile="/sf/os/mm/devsound/a3facf/group" mrp="/sf/os/mm/devsound/a3facf/group/multimedia_a3f_acf.mrp"/>
-</component>
-<component name="devsoundpluginsupport" long-name="DevSound Plugin Support" introduced="7.0s" purpose="optional">
-<!-- PLACEHOLDER="DEF137592" START REMOVE -->
-<unit bldFile="/sf/mw/mmmw/mmmiddlewarefws/mmfw/SoundDev/group_pluginsupport" mrp="/sf/mw/mmmw/mmmiddlewarefws/mmfw/SoundDev/group_pluginsupport/multimedia_mdf_devsound_pluginsupport.mrp"/>
-<!-- PLACEHOLDER="DEF137592" END REMOVE -->
-<!-- PLACEHOLDER="DEF137592"
- <unit bldFile="devsound/devsoundpluginsupport/group" mrp="devsound/devsoundpluginsupport/group/multimedia_mdf_devsound_pluginsupport.mrp"/>
- -->
-</component>
-<component name="refdevsound" long-name="Reference DevSound Plugins" introduced="7.0s" purpose="optional">
-<!-- PLACEHOLDER="DEF137592" START REMOVE -->
-<unit bldFile="/sf/mw/mmmw/mmmiddlewarefws/mmfw/SoundDev/group_refplugin" mrp="/sf/mw/mmmw/mmmiddlewarefws/mmfw/SoundDev/group_refplugin/multimedia_mdf_devsound_refplugin.mrp"/>
-<!-- PLACEHOLDER="DEF137592" END REMOVE -->
-<!-- PLACEHOLDER="DEF137592"
- <unit bldFile="devsound/devsoundrefplugin/group" mrp="devsound/devsoundrefplugin/group/multimedia_mdf_devsound_refplugin.mrp"/>
- -->
-</component>
-<component name="btdevsound" long-name="Bluetooth DevSound Plugin" introduced="7.0s" purpose="development" plugin="Y">
-<!-- PLACEHOLDER="DEF137592" START REMOVE -->
-<unit bldFile="/sf/mw/mmmw/mmmiddlewarefws/mmfw/sounddevbt/group" mrp="/sf/mw/mmmw/mmmiddlewarefws/mmfw/sounddevbt/group/multimedia_mdf_devsound_refbtplugin.mrp"/>
-<!-- PLACEHOLDER="DEF137592" END REMOVE -->
-<!-- PLACEHOLDER="DEF137592"
- <unit bldFile="devsound/sounddevbt/group" mrp="devsound/sounddevbt/group/multimedia_mdf_devsound_refbtplugin.mrp"/>
- -->
-</component>
-<component name="a3ftrace" long-name="A3F Trace Utility" introduced="tb91" purpose="development">
-<unit bldFile="/sf/os/mm/devsound/a3ftrace/group" mrp="/sf/os/mm/devsound/a3ftrace/group/multimedia_a3f_traces.mrp"/>
-</component>
-<component name="a3fintegrationtest" long-name="A3F Integration Tests" introduced="tb91" purpose="development">
-<unit mrp="/sf/os/mm/devsound/a3fintegrationtest/group/multimedia_inttest_a3f_devsound_source.mrp"/>
-</component>
-<component name="a3fsrvstart" long-name="A3F Server Start" introduced="tb91" purpose="optional" plugin="Y">
-<unit bldFile="/sf/os/mm/devsound/a3fsrvstart/group" mrp="/sf/os/mm/devsound/a3fsrvstart/group/multimedia_a3f_serverstart.mrp"/>
-</component>
-</collection>
-<collection name="mmhais" long-name="Multimedia Hardware Adaptation Interfaces" level="adaptation">
-<component name="devsoundhwdeviceapi" long-name="DevSound Hardware Device API" introduced="7.0s" purpose="optional">
-<!-- PLACEHOLDER="DEF137592" START REMOVE -->
-<unit bldFile="/sf/mw/mmmw/mmmiddlewarefws/mmfw/SoundDev/group_hwdev" mrp="/sf/mw/mmmw/mmmiddlewarefws/mmfw/SoundDev/group_hwdev/multimedia_mdf_devsound_hwdev.mrp"/>
-<!-- PLACEHOLDER="DEF137592" END REMOVE -->
-<!-- PLACEHOLDER="DEF137592"
- <unit bldFile="devsound/hwdevapi/group" mrp="devsound/sounddevbt/group/devsound/hwdevapi/group/multimedia_mdf_devsound_hwdev.mrp"/>
- -->
-</component>
-<component name="a3facl" long-name="A3F Audio Component Library" introduced="tb91" purpose="development">
-<unit bldFile="/sf/os/mm/mmhais/a3facl/group" mrp="/sf/os/mm/mmhais/a3facl/group/multimedia_a3f_acl.mrp"/>
-</component>
-<component name="a3fdevsoundcustomisation" long-name="A3F DevSound Customisation" introduced="tb91" purpose="optional">
-<unit bldFile="/sf/os/mm/mmhais/a3fdevsoundcustomisation/group" mrp="/sf/os/mm/mmhais/a3fdevsoundcustomisation/group/multimedia_a3f_devsoundadaptationinfo.mrp"/>
-</component>
-<component name="refacladapt" long-name="Reference ACL Adaptation" introduced="tb91" purpose="optional">
-<unit bldFile="/sf/os/mm/mmhais/refacladapt/group" mrp="/sf/os/mm/mmhais/refacladapt/group/multimedia_a3f_refacladaptation.mrp"/>
-</component>
-<component name="videohai" long-name="Video HAI" introduced="7.0s" purpose="mandatory">
-<unit bldFile="/sf/os/mm/mmhais/videohai/group" mrp="/sf/os/mm/mmhais/videohai/group/multimedia_videohai.mrp"/>
-</component>
-<component name="dvbhreceiverhai" long-name="Mobile TV DVB-H Receiver HAI" introduced="tb91" purpose="optional">
-<unit bldFile="/sf/os/mm/mmhais/dvbhreceiverhai/hai/dvbh/group" mrp="/sf/os/mm/mmhais/dvbhreceiverhai/hai/dvbh/group/multimedia_mobiletv_dvbh_hai.mrp"/>
-</component>
-<component name="dvbhunittest" long-name="Mobile TV DVB-H Unit Tests" introduced="tb91" purpose="development">
-<unit mrp="/sf/os/mm/mmhais/dvbhunittest/hai/dvbh/group/multimedia_unittest_dvbhhai.mrp"/>
-</component>
-</collection>
-<!-- not used in an active configuration
- <collection id="mmhostprocess" name="Multimedia Host Process" level="devices">
- <component id="mmhpvideoclient" name="MMHP Video Client" introduced="Future" purpose="optional">
- <unit bldFile="mmhostprocess/mmhpvideoclient/mmvideocomponents/group" mrp="mmhostprocess/mmhpvideoclient/mmvideocomponents/group/multimedia_mmhp_video_client.mrp"/>
- </component>
- <component id="mmhpaudioclient" name="MMHP Audio Client" introduced="Future" purpose="optional">
- <unit bldFile="mmhostprocess/mmhpaudioclient/mmaudiocomponents/group" mrp="mmhostprocess/mmhpaudioclient/mmaudiocomponents/group/multimedia_mmhp_audio_client.mrp"/>
- </component>
- <component id="mmhpcameraclient" name="MMHP Camera Client" introduced="Future" purpose="optional">
- <unit bldFile="mmhostprocess/mmhpcameraclient/mmcameracomponents/group" mrp="mmhostprocess/mmhpcameraclient/mmcameracomponents/group/multimedia_mmhp_camera_client.mrp"/>
- </component>
- </collection>
- -->
-<!-- not used in an active configuraiton
- <collection id="mmdataplane" name="Multimedia Data Plane Adaptation" level="hw-if">
- <component id="omxilnodes" name="OpenMAX IL Data Plane Nodes" introduced="Future" purpose="optional" class="plugin">
- <unit bldFile="mmdataplane/omxilnodes/group" mrp="mmdataplane/omxilnodes/group/multimedia_data_plane_nodes.mrp"/>
- </component>
- <component id="omxiltranslators" name="OpenMAX IL Translators" introduced="Future" purpose="optional" class="plugin">
- <unit bldFile="mmdataplane/omxiltranslators/group_translators" mrp="mmdataplane/omxiltranslators/group_translators/multimedia_openmax_il_translators.mrp"/>
- </component>
- </collection>
- -->
-<collection name="mmapitest" long-name="Multimedia API Tests" level="app-if">
-<component name="mmsvs" long-name="Multimedia Verification Suite" introduced="tb91" purpose="development">
-<unit mrp="/sf/os/mm/mmapitest/mmsvs/group/mmsvs.mrp"/>
-</component>
-<component name="devvideohaitest" long-name="DevVideo HAI Tests" introduced="tb91" purpose="development">
-<unit mrp="/sf/os/mm/mmapitest/devvideohaitest/group/devvideohaitest.mrp"/>
-</component>
-<component name="devsoundhaitest" long-name="DevSound HAI Tests" introduced="tb91" purpose="development">
-<unit mrp="/sf/os/mm/mmapitest/devsoundhaitest/group/devsoundhaitest.mrp"/>
-</component>
-<component name="devsoundexthaitest" long-name="DevSound Extensions HAI Tests" introduced="tb91" purpose="development">
-<unit mrp="/sf/os/mm/mmapitest/devsoundexthaitest/group/devsoundexthaitest.mrp"/>
-</component>
-</collection>
-<collection name="s60">
-<component name="mm">
-<unit bldFile="/sf/os/mm/group" mrp=""/>
-</component>
-</collection>
-</block>
-</layer>
-</systemModel>
-</SystemDefinition>
\ No newline at end of file
+<!DOCTYPE SystemDefinition [
+<!ELEMENT SystemDefinition ( systemModel )>
+<!ATTLIST SystemDefinition
+ name CDATA #REQUIRED
+ schema CDATA #REQUIRED
+>
+<!-- all paths are relative to the environment variable specified by the root attribute, or SOURCEROOT if not. -->
+
+<!-- System Model Section of DTD -->
+<!ELEMENT systemModel (layer+)>
+
+<!ELEMENT layer (block* | collection*)*>
+<!-- Kernel Services, Base Services, OS Services, Etc -->
+<!ATTLIST layer
+ name CDATA #REQUIRED
+ long-name CDATA #IMPLIED
+ levels NMTOKENS #IMPLIED
+ span CDATA #IMPLIED
+>
+
+<!ELEMENT block (subblock* | collection*)*>
+ <!-- Generic OS services, Comms Services, etc -->
+<!ATTLIST block
+ levels NMTOKENS #IMPLIED
+ span CDATA #IMPLIED
+ level NMTOKEN #IMPLIED
+ name CDATA #REQUIRED
+ long-name CDATA #IMPLIED
+>
+
+<!ELEMENT subblock (collection)*>
+<!-- Cellular Baseband Services, Networking Services, etc -->
+<!ATTLIST subblock
+ name CDATA #REQUIRED
+ long-name CDATA #IMPLIED
+>
+
+<!ELEMENT collection (component)*>
+<!-- Screen Driver, Content Handling, etc -->
+<!ATTLIST collection
+ name CDATA #REQUIRED
+ long-name CDATA #IMPLIED
+ level NMTOKEN #IMPLIED
+>
+
+<!ELEMENT component (unit)*>
+<!-- contains units or is a package or prebuilt -->
+<!ATTLIST component
+ name CDATA #REQUIRED
+ long-name CDATA #IMPLIED
+ deprecated CDATA #IMPLIED
+ introduced CDATA #IMPLIED
+ contract CDATA #IMPLIED
+ plugin (Y|N) "N"
+ filter CDATA #IMPLIED
+ class NMTOKENS #IMPLIED
+ supports CDATA #IMPLIED
+ purpose ( optional | mandatory | development ) "optional"
+>
+
+<!ELEMENT unit EMPTY >
+<!-- must be buildable (bld.inf) -->
+<!-- bldFile may someday be removed in favour of mrp -->
+<!ATTLIST unit
+ mrp CDATA #IMPLIED
+ filter CDATA #IMPLIED
+ bldFile CDATA #IMPLIED
+ root CDATA #IMPLIED
+ version NMTOKEN #IMPLIED
+ prebuilt NMTOKEN #IMPLIED
+ late (Y|N) #IMPLIED
+ priority CDATA #IMPLIED
+>
+]>
+<SystemDefinition name="Symbian^3" schema="2.0.1">
+ <systemModel>
+ <layer name="os" long-name="OS" levels="hw services">
+ <block name="mm" level="services" long-name="Multimedia" levels="adaptation hw-if device-fw devices middleware app-if">
+ <collection name="devsoundextensions" long-name="Devsound Extensions" level="device-fw">
+ <component name="drmaudioplayer" filter="s60" long-name="DRM Audio Player">
+ <unit bldFile="/sf/os/mm/devsoundextensions/drmaudioplayer/group"/>
+ </component>
+ <component name="mmextfw" filter="s60" long-name="Multimedia Extension Framework">
+ <unit bldFile="/sf/os/mm/devsoundextensions/mmextfw/group"/>
+ </component>
+ <component name="audiorouting" filter="s60" long-name="Audio Routing">
+ <unit bldFile="/sf/os/mm/devsoundextensions/audiorouting/group"/>
+ </component>
+ <component name="effects" filter="s60" long-name="Effects">
+ <unit bldFile="/sf/os/mm/devsoundextensions/effects/group"/>
+ </component>
+ <component name="effectspresets" filter="s60" long-name="Effects Presets">
+ <unit bldFile="/sf/os/mm/devsoundextensions/effectspresets/group"/>
+ </component>
+ <component name="effectspresets_utils" filter="s60" long-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="/sf/os/mm/devsoundextensions/effectspresets/AudioEqualizerUtility/group" filter="!dfs_build"/>
+ <unit bldFile="/sf/os/mm/devsoundextensions/effectspresets/EnvironmentalReverbUtility/group" filter="!dfs_build"/>
+ <unit bldFile="/sf/os/mm/devsoundextensions/effectspresets/StereoWideningUtility/group" filter="!dfs_build"/>
+ </component>
+ <component name="telephonyaudiorouting" filter="s60" long-name="Telephony Audio Routing">
+ <unit bldFile="/sf/os/mm/devsoundextensions/telephonyaudiorouting/group"/>
+ </component>
+ <component name="mmfcustominterfaces" filter="s60" long-name="MMF Custom Interfaces">
+ <unit bldFile="/sf/os/mm/devsoundextensions/mmfcustominterfaces/group"/>
+ </component>
+ <component name="addeddevsoundcontrol" filter="s60" long-name="Added DevSound Control">
+ <unit bldFile="/sf/os/mm/devsoundextensions/addeddevsoundcontrol/group"/>
+ </component>
+ <component name="globalaudiosettings" filter="s60" long-name="Global Audio Settings">
+ <unit bldFile="/sf/os/mm/devsoundextensions/globalaudiosettings/group"/>
+ </component>
+ <component name="restrictedaudiooutput" filter="s60" long-name="Restricted Audio Output">
+ <unit bldFile="/sf/os/mm/devsoundextensions/restrictedaudiooutput/group"/>
+ </component>
+ <component name="ciextnfactoryplugins" filter="s60" long-name="Custom Interface Extension Factory Plugins" plugin="Y">
+ <unit bldFile="/sf/os/mm/devsoundextensions/ciextnfactoryplugins/group"/>
+ </component>
+ </collection>
+ <collection name="mdfdevvideoextensions" long-name="MDF Dev Video Extensions" level="device-fw">
+ <component name="arm_mdf_postprocessor" filter="s60" long-name="ARM MDF Postprocessor">
+ <unit bldFile="/sf/os/mm/mdfdevvideoextensions/arm_mdf_postprocessor/group"/>
+ </component>
+ <component name="nga_mdf_tsrc" long-name="NGA MDF Tests" purpose="development" filter="s60,pref_test,module_test">
+ <unit bldFile="/sf/os/mm/mdfdevvideoextensions/nga_mdf_postprocessor/tsrc/StifNgaMdfPoPTest/group"/>
+ </component>
+ </collection>
+ <collection name="audio" long-name="Audio Codecs" level="middleware">
+ <component name="arm_cmmf_codecs" filter="s60" long-name="ARM CMMF Codecs" plugin="Y">
+ <unit bldFile="/sf/os/mm/audio/arm_cmmf_codecs/group"/>
+ </component>
+ </collection>
+ <collection name="video" long-name="Video Codecs" level="middleware">
+ <!-- empty -->
+ </collection>
+ <collection name="videoadaptationextensions" long-name="Video Adaptation Extensions" level="adaptation">
+ <component name="postingsurface" filter="s60" long-name="Posting Surface">
+ <unit bldFile="/sf/os/mm/videoadaptationextensions/postingsurface/group"/>
+ </component>
+ </collection>
+ <collection name="imagingandcamerafws" long-name="Imaging and Camera Frameworks" level="app-if">
+ <component name="imagingfws" long-name="Imaging Frameworks" introduced="7.0s" purpose="mandatory">
+ <unit bldFile="/sf/os/mm/imagingandcamerafws/imagingfws/group" mrp="/sf/os/mm/imagingandcamerafws/imagingfws/group/multimedia_icl.mrp"/>
+ </component>
+ <component name="imagingunittest" long-name="Imaging Unit Tests" introduced="7.0s" purpose="development" filter="test">
+ <unit mrp="/sf/os/mm/imagingandcamerafws/imagingunittest/group/multimedia_unittest_icl_source.mrp" bldFile="/sf/os/mm/imagingandcamerafws/imagingunittest/group"/>
+ </component>
+ <component name="imaginginttest" long-name="Imaging Integration Tests" introduced="7.0s" purpose="development" filter="test">
+ <unit mrp="/sf/os/mm/imagingandcamerafws/imaginginttest/group/multimedia_inttest_icl_source.mrp" bldFile="/sf/os/mm/imagingandcamerafws/imaginginttest/group"/>
+ </component>
+ <component name="camerafw" long-name="Camera Framework" introduced="7.0s" purpose="optional">
+ <unit bldFile="/sf/os/mm/imagingandcamerafws/camerafw/group" mrp="/sf/os/mm/imagingandcamerafws/camerafw/group/multimedia_ecam_framework.mrp"/>
+ </component>
+ <component name="cameraunittest" long-name="Camera Unit Tests" introduced="9.2" purpose="development" filter="test">
+ <unit mrp="/sf/os/mm/imagingandcamerafws/cameraunittest/group/multimedia_unittest_ecam_source.mrp" bldFile="/sf/os/mm/imagingandcamerafws/cameraunittest/group"/>
+ </component>
+ </collection>
+ <collection name="mmlibs" long-name="Multimedia Libraries" level="middleware">
+ <component name="mmutilitylib" long-name="Multimedia Utility Library" introduced="8.1" purpose="mandatory">
+ <unit bldFile="/sf/os/mm/mmlibs/mmutilitylib/group" mrp="/sf/os/mm/mmlibs/mmutilitylib/group/multimedia_common.mrp"/>
+ </component>
+ <component name="mmfw" long-name="Multimedia Framework" introduced="7.0s" purpose="mandatory">
+ <unit bldFile="/sf/os/mm/mmlibs/mmfw/group" mrp="/sf/os/mm/mmlibs/mmfw/group/multimedia_mmf.mrp"/>
+ </component>
+ </collection>
+ <collection name="mmplugins" long-name="Multimedia Plugins" level="middleware">
+ <component name="imagingplugins" long-name="Imaging Plugins" introduced="7.0s" purpose="optional" plugin="Y">
+ <unit bldFile="/sf/os/mm/mmplugins/imagingplugins/group" mrp="/sf/os/mm/mmplugins/imagingplugins/group/multimedia_icl_plugin.mrp"/>
+ </component>
+ <component name="cameraplugins" long-name="Camera Plugins" introduced="7.0s" purpose="optional" plugin="Y">
+ <unit bldFile="/sf/os/mm/mmplugins/cameraplugins/group" mrp="/sf/os/mm/mmplugins/cameraplugins/group/multimedia_ecam_plugins.mrp"/>
+ </component>
+ <component name="lib3gp" long-name="3GP Library" introduced="^2" purpose="optional">
+ <unit bldFile="/sf/os/mm/mmplugins/lib3gp/group" mrp="/sf/os/mm/mmplugins/lib3gp/group/multimedia_3gplibrary.mrp"/>
+ </component>
+ <component name="lib3gpunittest" long-name="3GP Unit Tests" introduced="^2" purpose="development" filter="test">
+ <unit mrp="/sf/os/mm/mmplugins/lib3gpunittest/group/multimedia_unittest_3gplibrary_source.mrp" bldFile="/sf/os/mm/mmplugins/lib3gpunittest/group"/>
+ </component>
+ <component name="mmfwplugins" long-name="Multimedia Framework Plugins" introduced="7.0s" purpose="optional" plugin="Y">
+ <unit bldFile="/sf/os/mm/mmplugins/mmfwplugins/group" mrp="/sf/os/mm/mmplugins/mmfwplugins/group/multimedia_mmf_plugin.mrp"/>
+ </component>
+ </collection>
+ <collection name="mm_info" long-name="Multimedia Info" level="app-if">
+ <component name="mm_plat" filter="s60" long-name="Multimedia Platform Interfaces" class="api">
+ <unit bldFile="/sf/os/mm/mm_plat/group"/>
+ </component>
+ <component name="mm_pub" filter="s60" long-name="Multimedia Public Interfaces" class="api">
+ <unit bldFile="/sf/os/mm/mm_pub/group"/>
+ </component>
+ <component name="mmdocs" long-name="Multimedia Documentation" purpose="development" class="doc">
+ <unit mrp="/sf/os/mm/mm_info/mmdocs/multimedia_documentation.mrp"/>
+ </component>
+ <component name="mm_tsrc" long-name="Multimedia Tests" purpose="development" filter="s60,api_test,pref_test">
+ <unit bldFile="/sf/os/mm/tsrc/group"/>
+ </component>
+ <component name="mm_metadata" long-name="Multimedia Metadata" introduced="^2" purpose="development" class="config PC">
+ <unit mrp="/sf/os/mm/mm_info/mm_metadata/mm_metadata.mrp"/>
+ </component>
+ </collection>
+ <collection name="mmresourcemgmt" long-name="Multimedia Resource Management" level="middleware">
+ <component name="mmresctrl" long-name="Multimedia Resource Controller" introduced="^2" purpose="development">
+ <unit bldFile="/sf/os/mm/mmresourcemgmt/mmresctrl/group" mrp="/sf/os/mm/mmresourcemgmt/mmresctrl/group/multimedia_a3f_refmmrc.mrp"/>
+ </component>
+ </collection>
+ <collection name="mmdevicefw" long-name="Multimedia Device Framework" level="device-fw">
+ <component name="mdf" long-name="Media Device Framework" introduced="9.2" purpose="mandatory">
+ <unit bldFile="/sf/os/mm/mmdevicefw/mdf/group" mrp="/sf/os/mm/mmdevicefw/mdf/group/multimedia_mdf.mrp"/>
+ </component>
+ <component name="mdfunittest" long-name="MDF Unit Tests" introduced="9.2" purpose="development" filter="test">
+ <unit mrp="/sf/os/mm/mmdevicefw/mdfunittest/group/multimedia_unittest_mdf_source.mrp" bldFile="/sf/os/mm/mmdevicefw/mdfunittest/group"/>
+ </component>
+ <component name="speechrecogsupport" long-name="Speech Recognition Support" introduced="7.0s" purpose="mandatory">
+ <unit bldFile="/sf/os/mm/mmdevicefw/speechrecogsupport/group" mrp="/sf/os/mm/mmdevicefw/speechrecogsupport/group/multimedia_mmf_ASR.mrp"/>
+ </component>
+ </collection>
+ <collection name="mmswadaptation" long-name="Multimedia Software Adaptation" level="adaptation">
+ <component name="videorenderer" long-name="Video Renderer" introduced="^3" purpose="optional">
+ <unit bldFile="/sf/os/mm/mmswadaptation/videorenderer/group" mrp="/sf/os/mm/mmswadaptation/videorenderer/group/multimedia_videorenderer.mrp"/>
+ </component>
+ </collection>
+ <collection name="mmtestenv" long-name="Multimedia Test Environment" level="device-fw">
+ <component name="mmtestfw" long-name="Multimedia Test Framework" introduced="7.0s" purpose="development" filter="test">
+ <unit mrp="/sf/os/mm/mmtestenv/mmtestfw/group/multimedia_testframework_source.mrp" bldFile="/sf/os/mm/mmtestenv/mmtestfw/group"/>
+ </component>
+ <component name="mmtestfwunittest" long-name="Multimedia Test Framework Unit Tests" introduced="7.0s" purpose="development" filter="test">
+ <unit mrp="/sf/os/mm/mmtestenv/mmtestfwunittest/group/multimedia_unittest_testframework_source.mrp" bldFile="/sf/os/mm/mmtestenv/mmtestfwunittest/group"/>
+ </component>
+ <component name="mmtestagent" long-name="Multimedia Test Agent" introduced="8.0" purpose="development" filter="test">
+ <unit mrp="/sf/os/mm/mmtestenv/mmtestagent/group/multimediatestagent_source.mrp" bldFile="/sf/os/mm/mmtestenv/mmtestagent/group"/>
+ </component>
+ <component name="mmtesttools" long-name="Multimedia Test Tools" purpose="development" filter="test">
+ <unit mrp="/sf/os/mm/mmtestenv/mmtesttools/Group/multimedia_testtools_source.mrp" bldFile="/sf/os/mm/mmtestenv/mmtesttools/Group"/>
+ </component>
+ </collection>
+ <collection name="omxil" long-name="OpenMAX IL" level="hw-if">
+ <component name="omxilapi" long-name="OpenMAX IL API" introduced="^3" purpose="optional">
+ <unit bldFile="/sf/os/mm/omxil/omxilapi/group" mrp="/sf/os/mm/omxil/omxilapi/group/multimedia_omx_il_api.mrp" version="1"/>
+ </component>
+ <component name="omxilcore" long-name="OpenMAX IL Core" introduced="^3" purpose="optional">
+ <unit bldFile="/sf/os/mm/omxil/omxilcore/group" mrp="/sf/os/mm/omxil/omxilcore/group/multimedia_omx_il_core.mrp" version="1"/>
+ </component>
+ <component name="omxilcomponentcommon" long-name="OpenMAX IL Component Framework" introduced="^3" purpose="optional">
+ <unit bldFile="/sf/os/mm/omxil/omxilcomponentcommon/group" mrp="/sf/os/mm/omxil/omxilcomponentcommon/group/multimedia_omx_il_comp.mrp" version="1"/>
+ </component>
+ <component name="omxilrefcomps" long-name="OpenMAX IL Reference Components" introduced="^3" purpose="optional">
+ <unit bldFile="/sf/os/mm/omxil/omxilrefcomps/ref_components/group" mrp="/sf/os/mm/omxil/omxilrefcomps/ref_components/group/multimedia_omx_il_comp_ref.mrp" version="1"/>
+ </component>
+ <component name="omxilunittest" long-name="OpenMAX IL Unit Tests" introduced="^3" purpose="development" filter="test">
+ <unit mrp="/sf/os/mm/omxil/omxilunittest/group/multimedia_unittest_omx_il.mrp" bldFile="/sf/os/mm/omxil/omxilunittest/group"/>
+ </component>
+ <component name="omxilcoreconftest" long-name="OpenMAX IL Core Conformance Suite" introduced="^3" purpose="development" filter="test">
+ <unit mrp="/sf/os/mm/omxil/omxilcoreconftest/group/multimedia_omx_il_core_loader_conf_suite.mrp" bldFile="/sf/os/mm/omxil/omxilcoreconftest/group"/>
+ </component>
+ <component name="mmilapi" long-name="Multimedia Integration Layer API" introduced="^3" purpose="development">
+ <unit bldFile="/sf/os/mm/omxil/mmilapi/group" mrp="/sf/os/mm/omxil/mmilapi/group/multimedia_il_api.mrp"/>
+ </component>
+ </collection>
+ <collection name="devsound" long-name="Sound Device" level="devices">
+ <component name="devsoundapi" long-name="DevSound API" introduced="7.0s" purpose="mandatory">
+ <unit bldFile="/sf/os/mm/devsound/devsoundapi/group" mrp="/sf/os/mm/devsound/devsoundapi/group/multimedia_mdf_devsound_api.mrp"/>
+ </component>
+ <component name="a3fdevsound" long-name="A3F DevSound" introduced="^2" purpose="optional">
+ <unit bldFile="/sf/os/mm/devsound/a3fdevsound/group" mrp="/sf/os/mm/devsound/a3fdevsound/group/multimedia_a3f_devsound.mrp"/>
+ </component>
+ <component name="a3facf" long-name="A3F Audio Component Framework" introduced="^2" purpose="optional">
+ <unit bldFile="/sf/os/mm/devsound/a3facf/group" mrp="/sf/os/mm/devsound/a3facf/group/multimedia_a3f_acf.mrp"/>
+ </component>
+ <component name="devsoundpluginsupport" long-name="DevSound Plugin Support" introduced="7.0s" purpose="optional">
+ <unit bldFile="/sf/os/mm/devsound/devsoundpluginsupport/group" mrp="/sf/os/mm/devsound/devsoundpluginsupport/group/multimedia_mdf_devsound_pluginsupport.mrp"/>
+ </component>
+ <component name="refdevsound" long-name="Reference DevSound Plugins" introduced="7.0s" purpose="optional">
+ <unit bldFile="/sf/os/mm/devsound/devsoundrefplugin/group" mrp="/sf/os/mm/devsound/devsoundrefplugin/group/multimedia_mdf_devsound_refplugin.mrp"/>
+ </component>
+ <component name="btdevsound" long-name="Bluetooth DevSound Plugin" introduced="7.0s" purpose="development" plugin="Y">
+ <unit bldFile="/sf/os/mm/devsound/sounddevbt/group" mrp="/sf/os/mm/devsound/sounddevbt/group/multimedia_mdf_devsound_refbtplugin.mrp"/>
+ </component>
+ <component name="a3ftrace" long-name="A3F Trace Utility" introduced="^2" purpose="development">
+ <unit bldFile="/sf/os/mm/devsound/a3ftrace/group" mrp="/sf/os/mm/devsound/a3ftrace/group/multimedia_a3f_traces.mrp"/>
+ </component>
+ <component name="a3fintegrationtest" long-name="A3F Integration Tests" introduced="^2" purpose="development" filter="test">
+ <unit mrp="/sf/os/mm/devsound/a3fintegrationtest/group/multimedia_inttest_a3f_devsound_source.mrp" bldFile="/sf/os/mm/devsound/a3fintegrationtest/group"/>
+ </component>
+ <component name="a3fsrvstart" long-name="A3F Server Start" introduced="^2" purpose="optional" plugin="Y">
+ <unit bldFile="/sf/os/mm/devsound/a3fsrvstart/group" mrp="/sf/os/mm/devsound/a3fsrvstart/group/multimedia_a3f_serverstart.mrp"/>
+ </component>
+ </collection>
+ <collection name="mmhais" long-name="Multimedia Hardware Adaptation Interfaces" level="adaptation">
+ <component name="devsoundhwdeviceapi" long-name="DevSound Hardware Device API" introduced="7.0s" purpose="optional">
+ <unit bldFile="/sf/os/mm/devsound/hwdevapi/group" mrp="/sf/os/mm/devsound/hwdevapi/group/multimedia_mdf_devsound_hwdev.mrp"/>
+ </component>
+ <component name="a3facl" long-name="A3F Audio Component Library" introduced="^2" purpose="development">
+ <unit bldFile="/sf/os/mm/mmhais/a3facl/group" mrp="/sf/os/mm/mmhais/a3facl/group/multimedia_a3f_acl.mrp"/>
+ </component>
+ <component name="a3fdevsoundcustomisation" long-name="A3F DevSound Customisation" introduced="^2" purpose="optional">
+ <unit bldFile="/sf/os/mm/mmhais/a3fdevsoundcustomisation/group" mrp="/sf/os/mm/mmhais/a3fdevsoundcustomisation/group/multimedia_a3f_devsoundadaptationinfo.mrp"/>
+ </component>
+ <component name="refacladapt" long-name="Reference ACL Adaptation" introduced="^2" purpose="optional">
+ <unit bldFile="/sf/os/mm/mmhais/refacladapt/group" mrp="/sf/os/mm/mmhais/refacladapt/group/multimedia_a3f_refacladaptation.mrp"/>
+ </component>
+ <component name="videohai" long-name="Video HAI" introduced="7.0s" purpose="mandatory">
+ <unit bldFile="/sf/os/mm/mmhais/videohai/group" mrp="/sf/os/mm/mmhais/videohai/group/multimedia_videohai.mrp"/>
+ </component>
+ <component name="dvbhreceiverhai" long-name="Mobile TV DVB-H Receiver HAI" introduced="^2" purpose="optional">
+ <unit bldFile="/sf/os/mm/mmhais/dvbhreceiverhai/hai/dvbh/group" mrp="/sf/os/mm/mmhais/dvbhreceiverhai/hai/dvbh/group/multimedia_mobiletv_dvbh_hai.mrp"/>
+ </component>
+ <component name="dvbhunittest" long-name="Mobile TV DVB-H Unit Tests" introduced="^2" purpose="development" filter="test">
+ <unit mrp="/sf/os/mm/mmhais/dvbhunittest/hai/dvbh/group/multimedia_unittest_dvbhhai.mrp" bldFile="/sf/os/mm/mmhais/dvbhunittest/hai/dvbh/group"/>
+ </component>
+ </collection>
+ <collection name="mmapitest" long-name="Multimedia API Tests" level="app-if">
+ <component name="mmsvs" long-name="Multimedia Verification Suite" introduced="^2" purpose="development">
+ <unit mrp="/sf/os/mm/mmapitest/mmsvs/group/mmsvs.mrp"/>
+ </component>
+ <component name="devvideohaitest" long-name="DevVideo HAI Tests" introduced="^2" purpose="development" filter="test">
+ <unit mrp="/sf/os/mm/mmapitest/devvideohaitest/group/devvideohaitest.mrp" bldFile="/sf/os/mm/mmapitest/devvideohaitest/group"/>
+ </component>
+ <component name="devsoundhaitest" long-name="DevSound HAI Tests" introduced="^2" purpose="development" filter="test">
+ <unit mrp="/sf/os/mm/mmapitest/devsoundhaitest/group/devsoundhaitest.mrp" bldFile="/sf/os/mm/mmapitest/devsoundhaitest/group"/>
+ </component>
+ <component name="devsoundexthaitest" long-name="DevSound Extensions HAI Tests" introduced="^2" purpose="development" filter="test">
+ <unit mrp="/sf/os/mm/mmapitest/devsoundexthaitest/group/devsoundexthaitest.mrp" bldFile="/sf/os/mm/mmapitest/devsoundexthaitest/group"/>
+ </component>
+ </collection>
+ </block>
+ </layer>
+ </systemModel>
+</SystemDefinition>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/symbian3/os/mm/package_definition_3.0.xml Mon Feb 15 18:25:55 2010 +0000
@@ -0,0 +1,251 @@
+<?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">
+ <!-- empty -->
+ </collection>
+ <collection id="videoadaptationextensions" name="Video Adaptation Extensions" level="adaptation">
+ <component id="postingsurface" filter="s60" name="Posting Surface">
+ <unit bldFile="videoadaptationextensions/postingsurface/group"/>
+ </component>
+ </collection>
+ <collection id="imagingandcamerafws" name="Imaging and Camera Frameworks" level="app-if">
+ <component id="imagingfws" name="Imaging Frameworks" introduced="7.0s" purpose="mandatory">
+ <unit bldFile="imagingandcamerafws/imagingfws/group" mrp="imagingandcamerafws/imagingfws/group/multimedia_icl.mrp"/>
+ </component>
+ <component id="imagingunittest" name="Imaging Unit Tests" introduced="7.0s" purpose="development" filter="test">
+ <unit mrp="imagingandcamerafws/imagingunittest/group/multimedia_unittest_icl_source.mrp" bldFile="imagingandcamerafws/imagingunittest/group"/>
+ </component>
+ <component id="imaginginttest" name="Imaging Integration Tests" introduced="7.0s" purpose="development" filter="test">
+ <unit mrp="imagingandcamerafws/imaginginttest/group/multimedia_inttest_icl_source.mrp" bldFile="imagingandcamerafws/imaginginttest/group"/>
+ </component>
+ <component id="camerafw" name="Camera Framework" introduced="7.0s" purpose="optional">
+ <unit bldFile="imagingandcamerafws/camerafw/group" mrp="imagingandcamerafws/camerafw/group/multimedia_ecam_framework.mrp"/>
+ </component>
+ <component id="cameraunittest" name="Camera Unit Tests" introduced="9.2" purpose="development" filter="test">
+ <unit mrp="imagingandcamerafws/cameraunittest/group/multimedia_unittest_ecam_source.mrp" bldFile="imagingandcamerafws/cameraunittest/group"/>
+ </component>
+ </collection>
+ <collection id="mmlibs" name="Multimedia Libraries" level="middleware">
+ <component id="mmutilitylib" name="Multimedia Utility Library" introduced="8.1" purpose="mandatory">
+ <unit bldFile="mmlibs/mmutilitylib/group" mrp="mmlibs/mmutilitylib/group/multimedia_common.mrp"/>
+ </component>
+ <component id="mmfw" name="Multimedia Framework" introduced="7.0s" purpose="mandatory">
+ <unit bldFile="mmlibs/mmfw/group" mrp="mmlibs/mmfw/group/multimedia_mmf.mrp"/>
+ </component>
+ </collection>
+ <collection id="mmplugins" name="Multimedia Plugins" level="middleware">
+ <component id="imagingplugins" name="Imaging Plugins" introduced="7.0s" purpose="optional" class="plugin">
+ <unit bldFile="mmplugins/imagingplugins/group" mrp="mmplugins/imagingplugins/group/multimedia_icl_plugin.mrp"/>
+ </component>
+ <component id="cameraplugins" name="Camera Plugins" introduced="7.0s" purpose="optional" class="plugin">
+ <unit bldFile="mmplugins/cameraplugins/group" mrp="mmplugins/cameraplugins/group/multimedia_ecam_plugins.mrp"/>
+ </component>
+ <component id="lib3gp" name="3GP Library" introduced="^2" purpose="optional">
+ <unit bldFile="mmplugins/lib3gp/group" mrp="mmplugins/lib3gp/group/multimedia_3gplibrary.mrp"/>
+ </component>
+ <component id="lib3gpunittest" name="3GP Unit Tests" introduced="^2" purpose="development" filter="test">
+ <unit mrp="mmplugins/lib3gpunittest/group/multimedia_unittest_3gplibrary_source.mrp" bldFile="mmplugins/lib3gpunittest/group"/>
+ </component>
+ <component id="mmfwplugins" name="Multimedia Framework Plugins" introduced="7.0s" purpose="optional" class="plugin">
+ <unit bldFile="mmplugins/mmfwplugins/group" mrp="mmplugins/mmfwplugins/group/multimedia_mmf_plugin.mrp"/>
+ </component>
+ </collection>
+ <collection id="mm_info" name="Multimedia Info" level="app-if">
+ <component id="mm_plat" filter="s60" name="Multimedia Platform Interfaces" class="api">
+ <unit bldFile="mm_plat/group"/>
+ </component>
+ <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>
+ </collection>
+ <collection id="mmresourcemgmt" name="Multimedia Resource Management" level="middleware">
+ <component id="mmresctrl" name="Multimedia Resource Controller" introduced="^2" purpose="development">
+ <unit bldFile="mmresourcemgmt/mmresctrl/group" mrp="mmresourcemgmt/mmresctrl/group/multimedia_a3f_refmmrc.mrp"/>
+ </component>
+ </collection>
+ <collection id="mmdevicefw" name="Multimedia Device Framework" level="device-fw">
+ <component id="mdf" name="Media Device Framework" introduced="9.2" purpose="mandatory">
+ <unit bldFile="mmdevicefw/mdf/group" mrp="mmdevicefw/mdf/group/multimedia_mdf.mrp"/>
+ </component>
+ <component id="mdfunittest" name="MDF Unit Tests" introduced="9.2" purpose="development" filter="test">
+ <unit mrp="mmdevicefw/mdfunittest/group/multimedia_unittest_mdf_source.mrp" bldFile="mmdevicefw/mdfunittest/group"/>
+ </component>
+ <component id="speechrecogsupport" name="Speech Recognition Support" introduced="7.0s" purpose="mandatory">
+ <unit bldFile="mmdevicefw/speechrecogsupport/group" mrp="mmdevicefw/speechrecogsupport/group/multimedia_mmf_ASR.mrp"/>
+ </component>
+ </collection>
+ <collection id="mmswadaptation" name="Multimedia Software Adaptation" level="adaptation">
+ <component id="videorenderer" name="Video Renderer" introduced="^3" purpose="optional">
+ <unit bldFile="mmswadaptation/videorenderer/group" mrp="mmswadaptation/videorenderer/group/multimedia_videorenderer.mrp"/>
+ </component>
+ </collection>
+ <collection id="mmtestenv" name="Multimedia Test Environment" level="device-fw">
+ <component id="mmtestfw" name="Multimedia Test Framework" introduced="7.0s" purpose="development" filter="test">
+ <unit mrp="mmtestenv/mmtestfw/group/multimedia_testframework_source.mrp" bldFile="mmtestenv/mmtestfw/group"/>
+ </component>
+ <component id="mmtestfwunittest" name="Multimedia Test Framework Unit Tests" introduced="7.0s" purpose="development" filter="test">
+ <unit mrp="mmtestenv/mmtestfwunittest/group/multimedia_unittest_testframework_source.mrp" bldFile="mmtestenv/mmtestfwunittest/group"/>
+ </component>
+ <component id="mmtestagent" name="Multimedia Test Agent" introduced="8.0" purpose="development" filter="test">
+ <unit mrp="mmtestenv/mmtestagent/group/multimediatestagent_source.mrp" bldFile="mmtestenv/mmtestagent/group"/>
+ </component>
+ <component id="mmtesttools" name="Multimedia Test Tools" purpose="development" filter="test">
+ <unit mrp="mmtestenv/mmtesttools/Group/multimedia_testtools_source.mrp" bldFile="mmtestenv/mmtesttools/Group"/>
+ </component>
+ </collection>
+ <collection id="omxil" name="OpenMAX IL" level="hw-if">
+ <component id="omxilapi" name="OpenMAX IL API" introduced="^3" purpose="optional">
+ <unit version="1" bldFile="omxil/omxilapi/group" mrp="omxil/omxilapi/group/multimedia_omx_il_api.mrp"/>
+ </component>
+ <component id="omxilcore" name="OpenMAX IL Core" introduced="^3" purpose="optional">
+ <unit version="1" bldFile="omxil/omxilcore/group" mrp="omxil/omxilcore/group/multimedia_omx_il_core.mrp"/>
+ </component>
+ <component id="omxilcomponentcommon" name="OpenMAX IL Component Framework" introduced="^3" purpose="optional">
+ <unit version="1" bldFile="omxil/omxilcomponentcommon/group" mrp="omxil/omxilcomponentcommon/group/multimedia_omx_il_comp.mrp"/>
+ </component>
+ <component id="omxilrefcomps" name="OpenMAX IL Reference Components" introduced="^3" purpose="optional">
+ <unit version="1" bldFile="omxil/omxilrefcomps/ref_components/group" mrp="omxil/omxilrefcomps/ref_components/group/multimedia_omx_il_comp_ref.mrp"/>
+ </component>
+ <component id="omxilunittest" name="OpenMAX IL Unit Tests" introduced="^3" purpose="development" filter="test">
+ <unit mrp="omxil/omxilunittest/group/multimedia_unittest_omx_il.mrp" bldFile="omxil/omxilunittest/group"/>
+ </component>
+ <component id="omxilcoreconftest" name="OpenMAX IL Core Conformance Suite" introduced="^3" purpose="development" filter="test">
+ <unit mrp="omxil/omxilcoreconftest/group/multimedia_omx_il_core_loader_conf_suite.mrp" bldFile="omxil/omxilcoreconftest/group"/>
+ </component>
+ <component id="mmilapi" name="Multimedia Integration Layer API" introduced="^3" purpose="development">
+ <unit bldFile="omxil/mmilapi/group" mrp="omxil/mmilapi/group/multimedia_il_api.mrp"/>
+ </component>
+ </collection>
+ <collection id="devsound" name="Sound Device" level="devices">
+ <component id="devsoundapi" name="DevSound API" introduced="7.0s" purpose="mandatory">
+ <unit bldFile="devsound/devsoundapi/group" mrp="devsound/devsoundapi/group/multimedia_mdf_devsound_api.mrp"/>
+ </component>
+ <component id="a3fdevsound" name="A3F DevSound" introduced="^2" purpose="optional">
+ <unit bldFile="devsound/a3fdevsound/group" mrp="devsound/a3fdevsound/group/multimedia_a3f_devsound.mrp"/>
+ </component>
+ <component id="a3facf" name="A3F Audio Component Framework" introduced="^2" purpose="optional">
+ <unit bldFile="devsound/a3facf/group" mrp="devsound/a3facf/group/multimedia_a3f_acf.mrp"/>
+ </component>
+ <component id="devsoundpluginsupport" name="DevSound Plugin Support" introduced="7.0s" purpose="optional">
+ <unit bldFile="devsound/devsoundpluginsupport/group" mrp="devsound/devsoundpluginsupport/group/multimedia_mdf_devsound_pluginsupport.mrp"/>
+ </component>
+ <component id="refdevsound" name="Reference DevSound Plugins" introduced="7.0s" purpose="optional">
+ <unit bldFile="devsound/devsoundrefplugin/group" mrp="devsound/devsoundrefplugin/group/multimedia_mdf_devsound_refplugin.mrp"/>
+ </component>
+ <component id="btdevsound" name="Bluetooth DevSound Plugin" introduced="7.0s" purpose="development" class="plugin">
+ <unit bldFile="devsound/sounddevbt/group" mrp="devsound/sounddevbt/group/multimedia_mdf_devsound_refbtplugin.mrp"/>
+ </component>
+ <component id="a3ftrace" name="A3F Trace Utility" introduced="^2" purpose="development">
+ <unit bldFile="devsound/a3ftrace/group" mrp="devsound/a3ftrace/group/multimedia_a3f_traces.mrp"/>
+ </component>
+ <component id="a3fintegrationtest" name="A3F Integration Tests" introduced="^2" purpose="development" filter="test">
+ <unit mrp="devsound/a3fintegrationtest/group/multimedia_inttest_a3f_devsound_source.mrp" bldFile="devsound/a3fintegrationtest/group"/>
+ </component>
+ <component id="a3fsrvstart" name="A3F Server Start" introduced="^2" purpose="optional" class="plugin">
+ <unit bldFile="devsound/a3fsrvstart/group" mrp="devsound/a3fsrvstart/group/multimedia_a3f_serverstart.mrp"/>
+ </component>
+ </collection>
+ <collection id="mmhais" name="Multimedia Hardware Adaptation Interfaces" level="adaptation">
+ <component id="devsoundhwdeviceapi" name="DevSound Hardware Device API" introduced="7.0s" purpose="optional">
+ <unit bldFile="devsound/hwdevapi/group" mrp="devsound/hwdevapi/group/multimedia_mdf_devsound_hwdev.mrp"/>
+ </component>
+ <component id="a3facl" name="A3F Audio Component Library" introduced="^2" purpose="development">
+ <unit bldFile="mmhais/a3facl/group" mrp="mmhais/a3facl/group/multimedia_a3f_acl.mrp"/>
+ </component>
+ <component id="a3fdevsoundcustomisation" name="A3F DevSound Customisation" introduced="^2" purpose="optional">
+ <unit bldFile="mmhais/a3fdevsoundcustomisation/group" mrp="mmhais/a3fdevsoundcustomisation/group/multimedia_a3f_devsoundadaptationinfo.mrp"/>
+ </component>
+ <component id="refacladapt" name="Reference ACL Adaptation" introduced="^2" purpose="optional">
+ <unit bldFile="mmhais/refacladapt/group" mrp="mmhais/refacladapt/group/multimedia_a3f_refacladaptation.mrp"/>
+ </component>
+ <component id="videohai" name="Video HAI" introduced="7.0s" purpose="mandatory">
+ <unit bldFile="mmhais/videohai/group" mrp="mmhais/videohai/group/multimedia_videohai.mrp"/>
+ </component>
+ <component id="dvbhreceiverhai" name="Mobile TV DVB-H Receiver HAI" introduced="^2" purpose="optional">
+ <unit bldFile="mmhais/dvbhreceiverhai/hai/dvbh/group" mrp="mmhais/dvbhreceiverhai/hai/dvbh/group/multimedia_mobiletv_dvbh_hai.mrp"/>
+ </component>
+ <component id="dvbhunittest" name="Mobile TV DVB-H Unit Tests" introduced="^2" purpose="development" filter="test">
+ <unit mrp="mmhais/dvbhunittest/hai/dvbh/group/multimedia_unittest_dvbhhai.mrp" bldFile="mmhais/dvbhunittest/hai/dvbh/group"/>
+ </component>
+ </collection>
+ <collection id="mmapitest" name="Multimedia API Tests" level="app-if">
+ <component id="mmsvs" name="Multimedia Verification Suite" introduced="^2" purpose="development">
+ <unit mrp="mmapitest/mmsvs/group/mmsvs.mrp"/>
+ </component>
+ <component id="devvideohaitest" name="DevVideo HAI Tests" introduced="^2" purpose="development" filter="test">
+ <unit mrp="mmapitest/devvideohaitest/group/devvideohaitest.mrp" bldFile="mmapitest/devvideohaitest/group"/>
+ </component>
+ <component id="devsoundhaitest" name="DevSound HAI Tests" introduced="^2" purpose="development" filter="test">
+ <unit mrp="mmapitest/devsoundhaitest/group/devsoundhaitest.mrp" bldFile="mmapitest/devsoundhaitest/group"/>
+ </component>
+ <component id="devsoundexthaitest" name="DevSound Extensions HAI Tests" introduced="^2" purpose="development" filter="test">
+ <unit mrp="mmapitest/devsoundexthaitest/group/devsoundexthaitest.mrp" bldFile="mmapitest/devsoundexthaitest/group"/>
+ </component>
+ </collection>
+ </package>
+</SystemDefinition>
--- a/symbian3/os/networkingsrv/package_definition.xml Fri Feb 12 16:37:22 2010 +0000
+++ b/symbian3/os/networkingsrv/package_definition.xml Mon Feb 15 18:25:55 2010 +0000
@@ -1,270 +1,249 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE SystemDefinition [
- <!ELEMENT SystemDefinition (systemModel?,SystemBuild?)>
- <!ATTLIST SystemDefinition
- name CDATA #REQUIRED
- schema CDATA #REQUIRED>
- <!ELEMENT systemModel (layer+)>
- <!ELEMENT layer (block*|collection*)*>
- <!ATTLIST layer
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED
- levels NMTOKENS #IMPLIED
- span CDATA #IMPLIED>
- <!ELEMENT block (subblock*|collection*)*>
- <!ATTLIST block
- levels NMTOKENS #IMPLIED
- span CDATA #IMPLIED
- level NMTOKEN #IMPLIED
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED>
- <!ELEMENT subblock (collection)*>
- <!ATTLIST subblock
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED>
- <!ELEMENT collection (component)*>
- <!ATTLIST collection
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED
- level NMTOKEN #IMPLIED>
- <!ELEMENT component (unit)*>
- <!ATTLIST component
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED
- deprecated CDATA #IMPLIED
- introduced CDATA #IMPLIED
- contract CDATA #IMPLIED
- plugin (Y|N) 'N'
- filter CDATA #IMPLIED
- class NMTOKENS #IMPLIED
- supports CDATA #IMPLIED
- purpose (optional|mandatory|development) 'optional'>
- <!ELEMENT unit EMPTY>
- <!ATTLIST unit
- mrp CDATA #IMPLIED
- filter CDATA #IMPLIED
- bldFile CDATA #IMPLIED
- root CDATA #IMPLIED
- version NMTOKEN #IMPLIED
- prebuilt NMTOKEN #IMPLIED
- late (Y|N) #IMPLIED
- priority CDATA #IMPLIED>
- <!ELEMENT SystemBuild (option*|target+|targetList+|list+|configuration+)*>
- <!ATTLIST SystemBuild schema CDATA #REQUIRED>
- <!ELEMENT list (ref+)>
- <!ATTLIST list
- name ID #REQUIRED
- description CDATA #REQUIRED>
- <!ELEMENT ref EMPTY>
- <!ATTLIST ref item CDATA #REQUIRED>
- <!ELEMENT targetList EMPTY>
- <!ATTLIST targetList
- name ID #REQUIRED
- description CDATA #REQUIRED
- target IDREFS #REQUIRED>
- <!ELEMENT target EMPTY>
- <!ATTLIST target
- name ID #REQUIRED
- abldTarget CDATA #REQUIRED
- description CDATA #REQUIRED>
- <!ELEMENT option EMPTY>
- <!ATTLIST option
- name ID #REQUIRED
- abldOption CDATA #REQUIRED
- description CDATA #REQUIRED
- enable (Y|N) #REQUIRED>
- <!ELEMENT configuration (listRef+|ref+|task+)*>
- <!ATTLIST configuration
- name ID #REQUIRED
- description CDATA #REQUIRED
- filter CDATA #REQUIRED>
- <!ELEMENT task (listRef*,(buildLayer|specialInstructions))>
- <!ELEMENT listRef EMPTY>
- <!ATTLIST listRef list CDATA #REQUIRED>
- <!ELEMENT buildLayer EMPTY>
- <!ATTLIST buildLayer
- command CDATA #REQUIRED
- targetList IDREFS #IMPLIED
- unitParallel (Y|N) #REQUIRED
- targetParallel (Y|N) 'N'>
- <!ELEMENT specialInstructions EMPTY>
- <!ATTLIST specialInstructions
- name CDATA #REQUIRED
- cwd CDATA #REQUIRED
- root CDATA #IMPLIED
- command CDATA #REQUIRED>
-]>
-<SystemDefinition schema="2.0.1" name="Symbian^3">
-<systemModel>
-<layer name="os" long-name="OS" levels="hw services">
-<block name="networkingsrv" level="services" long-name="Networking Services" levels="adaptation hw-if plugin framework server app-if">
-<collection name="esockapiextensions" long-name="ESock API Extensions" level="app-if">
-<component name="internetsockets" long-name="Internet Sockets" introduced="ER5" purpose="mandatory">
-<unit bldFile="/sf/os/networkingsrv/esockapiextensions/internetsockets/group" mrp="/sf/os/networkingsrv/esockapiextensions/internetsockets/group/networking_insock.mrp"/>
-</component>
-</collection>
-<collection name="tcpiputils" long-name="TCP/IP Utilities" level="plugin">
-<component name="dnd" long-name="DND" introduced="7.0" purpose="mandatory">
-<unit bldFile="/sf/os/networkingsrv/tcpiputils/dnd/group" mrp="/sf/os/networkingsrv/tcpiputils/dnd/group/networking_dnd.mrp"/>
-</component>
-<component name="dndconfig" long-name="DND Config" introduced="7.0" purpose="mandatory" class="config">
-<unit mrp="/sf/os/networkingsrv/tcpiputils/dnd/group/networking_dnd-config.mrp"/>
-</component>
-<component name="dhcp" long-name="DHCP" introduced="8.0" purpose="optional">
-<unit bldFile="/sf/os/networkingsrv/tcpiputils/dhcp/group" mrp="/sf/os/networkingsrv/tcpiputils/dhcp/group/networking_dhcp.mrp"/>
-</component>
-<component name="networkaddressandporttranslation" long-name="Network Address and Port Translation" introduced="tb91" purpose="mandatory" plugin="Y">
-<unit bldFile="/sf/os/networkingsrv/tcpiputils/networkaddressandporttranslation/group" mrp="/sf/os/networkingsrv/tcpiputils/networkaddressandporttranslation/group/networking_napt.mrp"/>
-</component>
-<component name="punycodeconv" long-name="Punycode Converter" introduced="tb92" purpose="mandatory">
-<unit bldFile="/sf/os/networkingsrv/tcpiputils/punycodeconv/group" mrp="/sf/os/networkingsrv/tcpiputils/punycodeconv/group/networking_punycodeconverter.mrp"/>
-</component>
-</collection>
-<collection name="linklayercontrol" long-name="Link Layer Control" level="hw-if">
-<component name="nullagt" long-name="NULL AGT" introduced="7.0s" purpose="optional" plugin="Y">
-<unit bldFile="/sf/os/networkingsrv/linklayercontrol/nullagt/group" mrp="/sf/os/networkingsrv/linklayercontrol/nullagt/group/networking_nullagt.mrp"/>
-</component>
-<component name="genericscprparameters" long-name="Generic SCPR Parameters" introduced="tb92" purpose="optional">
-<unit bldFile="/sf/os/networkingsrv/linklayercontrol/genericscprparameters/group" mrp="/sf/os/networkingsrv/linklayercontrol/genericscprparameters/group/networking_genericscprparams.mrp"/>
-</component>
-<component name="mbmsparameters" long-name="MBMS Parameters" introduced="tb92" purpose="optional" plugin="Y">
-<unit bldFile="/sf/os/networkingsrv/linklayercontrol/mbmsparameters/group" mrp="/sf/os/networkingsrv/linklayercontrol/mbmsparameters/group/networking_mbmsparams.mrp"/>
-</component>
-</collection>
-<collection name="linklayerprotocols" long-name="Link Layer Protocols" level="hw-if">
-<component name="ethernetnif" long-name="Ethernet NIF" purpose="optional" plugin="Y">
-<unit bldFile="/sf/os/networkingsrv/linklayerprotocols/ethernetnif/group" mrp="/sf/os/networkingsrv/linklayerprotocols/ethernetnif/group/networking_ether802.mrp"/>
-</component>
-<component name="ethernetpacketdriver" long-name="Ethernet Packet Driver" introduced="7.0" purpose="optional" plugin="Y">
-<unit mrp="/sf/os/networkingsrv/linklayerprotocols/ethernetpacketdriver/group/networking_etherdrv_srconly.mrp"/>
-</component>
-<component name="pppnif" long-name="PPP NIF" introduced="ER5" purpose="optional" plugin="Y">
-<unit bldFile="/sf/os/networkingsrv/linklayerprotocols/pppnif/group" mrp="/sf/os/networkingsrv/linklayerprotocols/pppnif/group/networking_ppp.mrp" version="2"/>
-</component>
-<component name="pppconfig" long-name="PPP Config" introduced="ER5" purpose="optional" class="config">
-<unit mrp="/sf/os/networkingsrv/linklayerprotocols/pppnif/group/networking_ppp-config.mrp" version="2"/>
-</component>
-<component name="slipnif" long-name="SLIP NIF" purpose="development" plugin="Y">
-<unit bldFile="/sf/os/networkingsrv/linklayerprotocols/slipnif/group" mrp="/sf/os/networkingsrv/linklayerprotocols/slipnif/group/networking_slip.mrp"/>
-</component>
-<component name="tunnelnif" long-name="Tunnel NIF" introduced="7.0s" purpose="optional" plugin="Y">
-<unit bldFile="/sf/os/networkingsrv/linklayerprotocols/tunnelnif/group" mrp="/sf/os/networkingsrv/linklayerprotocols/tunnelnif/group/networking_tunnelnif.mrp"/>
-</component>
-</collection>
-<collection name="linklayerutils" long-name="Link Layer Utilities" level="hw-if">
-<component name="packetlogger" long-name="Packet Logger" introduced="8.1" purpose="development">
-<unit bldFile="/sf/os/networkingsrv/linklayerutils/packetlogger/group" mrp="/sf/os/networkingsrv/linklayerutils/packetlogger/group/networking_packetlogger.mrp"/>
-</component>
-</collection>
-<collection name="networkcontrol" long-name="Network Control" level="plugin">
-<component name="qosfwconfig" long-name="QoS Framework Config" introduced="7.0s" purpose="optional" class="config">
-<unit mrp="/sf/os/networkingsrv/networkcontrol/qosfwconfig/qos/group/networking_qos-config.mrp"/>
-</component>
-<component name="qoslib" long-name="QoS Library" introduced="7.0s" purpose="optional">
-<unit bldFile="/sf/os/networkingsrv/networkcontrol/qoslib/group" mrp="/sf/os/networkingsrv/networkcontrol/qoslib/group/networking_qoslib.mrp"/>
-</component>
-<component name="pfqoslib" long-name="PF QoS Library" introduced="7.0s" purpose="optional">
-<unit bldFile="/sf/os/networkingsrv/networkcontrol/pfqoslib/group" mrp="/sf/os/networkingsrv/networkcontrol/pfqoslib/group/networking_pfqoslib.mrp"/>
-</component>
-<component name="qosfwprt" long-name="QoS Framework PRT" introduced="7.0s" purpose="optional" plugin="Y">
-<unit bldFile="/sf/os/networkingsrv/networkcontrol/qosfwconfig/qos/group" mrp="/sf/os/networkingsrv/networkcontrol/qosfwconfig/qos/group/networking_qos.mrp"/>
-</component>
-<component name="qosipscpr" long-name="QoS IP SCPR" purpose="optional" plugin="Y">
-<unit bldFile="/sf/os/networkingsrv/networkcontrol/qosipscpr/group" mrp="/sf/os/networkingsrv/networkcontrol/qosipscpr/group/networking_qosipscpr.mrp"/>
-</component>
-<component name="ipnetworklayer" long-name="IP Network Layer" introduced="tb92" purpose="optional" plugin="Y">
-<unit bldFile="/sf/os/networkingsrv/networkcontrol/ipnetworklayer/group" mrp="/sf/os/networkingsrv/networkcontrol/ipnetworklayer/group/networking_ipproto.mrp"/>
-</component>
-<component name="iptransportlayer" long-name="IP Transport Layer" introduced="tb92" purpose="optional" plugin="Y">
-<unit bldFile="/sf/os/networkingsrv/networkcontrol/iptransportlayer/group" mrp="/sf/os/networkingsrv/networkcontrol/iptransportlayer/group/networking_iptransport.mrp"/>
-</component>
-<component name="commsuserpromptmgr" long-name="Comms User Prompt Manager" introduced="tb92" purpose="mandatory">
-<unit bldFile="/sf/os/networkingsrv/networkcontrol/commsuserpromptmgr/group" mrp="/sf/os/networkingsrv/networkcontrol/commsuserpromptmgr/group/networking_netups.mrp"/>
-</component>
-<component name="ipupsplugins" long-name="IP UPS Plugins" introduced="tb92" purpose="optional" plugin="Y">
-<unit bldFile="/sf/os/networkingsrv/networkcontrol/ipupsplugins/group" mrp="/sf/os/networkingsrv/networkcontrol/ipupsplugins/group/networking_ipups.mrp"/>
-</component>
-</collection>
-<collection name="networkprotocols" long-name="Network Protocols" level="plugin">
-<component name="tcpipv4config" long-name="TCP/IPv4/v6 Config" introduced="7.0" purpose="mandatory" class="config">
-<unit mrp="/sf/os/networkingsrv/networkprotocols/tcpipv4v6prt/group/networking_tcpip6-config.mrp"/>
-</component>
-<component name="ipeventnotifier" long-name="IP Event Notifier" introduced="8.1" purpose="mandatory" plugin="Y">
-<unit bldFile="/sf/os/networkingsrv/networkprotocols/ipeventnotifier/group" mrp="/sf/os/networkingsrv/networkprotocols/ipeventnotifier/group/networking_ipeventnotifier.mrp"/>
-</component>
-<component name="tcpipv4v6prt" long-name="TCP/IPv4/v6 PRT" introduced="7.0" purpose="mandatory" plugin="Y">
-<unit bldFile="/sf/os/networkingsrv/networkprotocols/tcpipv4v6prt/group" mrp="/sf/os/networkingsrv/networkprotocols/tcpipv4v6prt/group/networking_tcpip6.mrp"/>
-</component>
-<component name="iphook" long-name="IP Hook" introduced="7.0" purpose="mandatory">
-<unit bldFile="/sf/os/networkingsrv/networkprotocols/iphook/inhook6/group" mrp="/sf/os/networkingsrv/networkprotocols/iphook/inhook6/group/networking_inhook6.mrp"/>
-</component>
-<component name="mobileip" long-name="Mobile IP" introduced="8.1" purpose="optional" plugin="Y">
-<unit bldFile="/sf/os/networkingsrv/networkprotocols/mobileip/group" mrp="/sf/os/networkingsrv/networkprotocols/mobileip/group/networking_mobileip.mrp"/>
-</component>
-<component name="dnsproxy" long-name="DNS Proxy" introduced="tb92" purpose="optional">
-<unit bldFile="/sf/os/networkingsrv/networkprotocols/dnsproxy/group" mrp="/sf/os/networkingsrv/networkprotocols/dnsproxy/group/networking_dnsproxy.mrp"/>
-</component>
-</collection>
-<collection name="networksecurity" long-name="Network Security" level="framework">
-<component name="tls" long-name="TLS" introduced="6.0" purpose="mandatory">
-<unit bldFile="/sf/os/networkingsrv/networksecurity/tls/group" mrp="/sf/os/networkingsrv/networksecurity/tls/group/networking_tls.mrp"/>
-</component>
-<component name="tlsprovider" long-name="TLS Provider" introduced="8.1" purpose="mandatory">
-<unit bldFile="/sf/os/networkingsrv/networksecurity/tlsprovider/group" mrp="/sf/os/networkingsrv/networksecurity/tlsprovider/group/security_tlsprovider.mrp"/>
-</component>
-<component name="ipsec" long-name="IPsec" introduced="7.0" purpose="optional">
-<unit bldFile="/sf/os/networkingsrv/networksecurity/ipsec/group" mrp="/sf/os/networkingsrv/networksecurity/ipsec/group/networking_ipsec.mrp"/>
-</component>
-</collection>
-<collection name="networkingtestandutils" long-name="Networking Test and Utils" level="app-if">
-<component name="networkingunittest" long-name="Networking Unit Test" introduced="7.0" purpose="development">
-<unit mrp="/sf/os/networkingsrv/networkingtestandutils/networkingunittest/group/networking_unittest.mrp"/>
-</component>
-<component name="networkingexamples" long-name="Networking Examples" introduced="7.0" purpose="development">
-<unit bldFile="/sf/os/networkingsrv/networkingtestandutils/networkingexamples/examplecode/group" mrp="/sf/os/networkingsrv/networkingtestandutils/networkingexamples/examplecode/group/networking_examplecode.mrp"/>
-</component>
-<component name="exampleinternetutilities" long-name="Example Internet Utilities" introduced="ER5" purpose="development">
-<unit mrp="/sf/os/networkingsrv/networkingtestandutils/exampleinternetutilities/group/networking_inetutil.mrp"/>
-</component>
-<component name="ipprobe" long-name="IP Probe" introduced="7.0s" purpose="development" plugin="Y">
-<unit mrp="/sf/os/networkingsrv/networkingtestandutils/ipprobe/group/networking_probe.mrp"/>
-</component>
-<component name="ipv6to4tunnel" long-name="IPv6 to 4 Tunnel" purpose="development" plugin="Y">
-<unit mrp="/sf/os/networkingsrv/networkingtestandutils/ipv6to4tunnel/group/networking_6to4.mrp"/>
-</component>
-<component name="ipanalyzer" long-name="IP Analyzer" deprecated="tb92" introduced="7.0" purpose="development">
-<unit mrp="/sf/os/networkingsrv/networkingtestandutils/ipanalyzer/group/networking_iprotor.mrp"/>
-</component>
-<component name="networkingintegrationtest" long-name="Networking Integration Test" introduced="ER5" purpose="development">
-<unit bldFile="/sf/os/networkingsrv/networkingtestandutils/networkingintegrationtest/Group" mrp="/sf/os/networkingsrv/networkingtestandutils/networkingintegrationtest/Group/networking_integrationtest.mrp"/>
-</component>
-<component name="networkingperformancemeasurementtools" long-name="Networking Performance Measurement Tools" introduced="tb92" purpose="development">
-<unit bldFile="/sf/os/networkingsrv/networkingtestandutils/networkingperformancemeasurementtools/group" mrp="/sf/os/networkingsrv/networkingtestandutils/networkingperformancemeasurementtools/group/networking_netperf.mrp"/>
-</component>
-</collection>
-<collection name="networkingsrv_info" long-name="Networking Services Info" level="app-if">
-<component name="networkingrom" long-name="Networking ROM" purpose="mandatory">
-<!-- production component: contains the IBY files -->
-<unit bldFile="/sf/os/networkingsrv/networkingsrv_info/networkingrom/group" mrp="/sf/os/networkingsrv/networkingsrv_info/networkingrom/group/networking_general.mrp"/>
-</component>
-<component name="networkingdocs" long-name="Networking Documentation" purpose="development" class="doc">
-<unit mrp="/sf/os/networkingsrv/networkingsrv_info/networkingdocs/networking_documentation.mrp"/>
-</component>
-<component name="networkingsrv_metadata" long-name="Networking Services Metadata" introduced="tb91" purpose="development" class="config PC">
-<unit mrp="/sf/os/networkingsrv/networkingsrv_info/networkingsrv_metadata/networkingsrv_metadata.mrp"/>
-</component>
-</collection>
-<collection name="pppcompressionplugins" long-name="PPP Compression Plugins" level="plugin">
-<component name="predictorcompression" long-name="Predictor Compression" introduced="6.0" purpose="optional" plugin="Y">
-<unit bldFile="/sf/os/networkingsrv/pppcompressionplugins/predictorcompression/group" mrp="/sf/os/networkingsrv/pppcompressionplugins/predictorcompression/group/networking_predcomp.mrp"/>
-</component>
-</collection>
-<collection name="s60">
-<component name="networkingsrv">
-<unit bldFile="/sf/os/networkingsrv/group" mrp=""/>
-</component>
-</collection>
-</block>
-</layer>
-</systemModel>
-</SystemDefinition>
\ No newline at end of file
+<!DOCTYPE SystemDefinition [
+<!ELEMENT SystemDefinition ( systemModel )>
+<!ATTLIST SystemDefinition
+ name CDATA #REQUIRED
+ schema CDATA #REQUIRED
+>
+<!-- all paths are relative to the environment variable specified by the root attribute, or SOURCEROOT if not. -->
+
+<!-- System Model Section of DTD -->
+<!ELEMENT systemModel (layer+)>
+
+<!ELEMENT layer (block* | collection*)*>
+<!-- Kernel Services, Base Services, OS Services, Etc -->
+<!ATTLIST layer
+ name CDATA #REQUIRED
+ long-name CDATA #IMPLIED
+ levels NMTOKENS #IMPLIED
+ span CDATA #IMPLIED
+>
+
+<!ELEMENT block (subblock* | collection*)*>
+ <!-- Generic OS services, Comms Services, etc -->
+<!ATTLIST block
+ levels NMTOKENS #IMPLIED
+ span CDATA #IMPLIED
+ level NMTOKEN #IMPLIED
+ name CDATA #REQUIRED
+ long-name CDATA #IMPLIED
+>
+
+<!ELEMENT subblock (collection)*>
+<!-- Cellular Baseband Services, Networking Services, etc -->
+<!ATTLIST subblock
+ name CDATA #REQUIRED
+ long-name CDATA #IMPLIED
+>
+
+<!ELEMENT collection (component)*>
+<!-- Screen Driver, Content Handling, etc -->
+<!ATTLIST collection
+ name CDATA #REQUIRED
+ long-name CDATA #IMPLIED
+ level NMTOKEN #IMPLIED
+>
+
+<!ELEMENT component (unit)*>
+<!-- contains units or is a package or prebuilt -->
+<!ATTLIST component
+ name CDATA #REQUIRED
+ long-name CDATA #IMPLIED
+ deprecated CDATA #IMPLIED
+ introduced CDATA #IMPLIED
+ contract CDATA #IMPLIED
+ plugin (Y|N) "N"
+ filter CDATA #IMPLIED
+ class NMTOKENS #IMPLIED
+ supports CDATA #IMPLIED
+ purpose ( optional | mandatory | development ) "optional"
+>
+
+<!ELEMENT unit EMPTY >
+<!-- must be buildable (bld.inf) -->
+<!-- bldFile may someday be removed in favour of mrp -->
+<!ATTLIST unit
+ mrp CDATA #IMPLIED
+ filter CDATA #IMPLIED
+ bldFile CDATA #IMPLIED
+ root CDATA #IMPLIED
+ version NMTOKEN #IMPLIED
+ prebuilt NMTOKEN #IMPLIED
+ late (Y|N) #IMPLIED
+ priority CDATA #IMPLIED
+>
+]>
+<SystemDefinition name="Symbian^3" schema="2.0.1">
+ <systemModel>
+ <layer name="os" long-name="OS" levels="hw services">
+ <block name="networkingsrv" level="services" long-name="Networking Services" levels="adaptation hw-if plugin framework server app-if">
+ <collection name="commsdb" long-name="Comms DB" level="server">
+ <component name="s60_commsdb" filter="s60" long-name="S60 Commsdb" class="config">
+ <unit bldFile="/sf/os/networkingsrv/commsdb/s60_commsdb/group"/>
+ </component>
+ </collection>
+ <collection name="esockapiextensions" long-name="ESock API Extensions" level="app-if">
+ <component name="internetsockets" long-name="Internet Sockets" introduced="ER5" purpose="mandatory">
+ <unit bldFile="/sf/os/networkingsrv/esockapiextensions/internetsockets/group" mrp="/sf/os/networkingsrv/esockapiextensions/internetsockets/group/networking_insock.mrp"/>
+ </component>
+ </collection>
+ <collection name="tcpiputils" long-name="TCP/IP Utilities" level="plugin">
+ <component name="dnd" long-name="DND" introduced="7.0" purpose="mandatory">
+ <unit bldFile="/sf/os/networkingsrv/tcpiputils/dnd/group" mrp="/sf/os/networkingsrv/tcpiputils/dnd/group/networking_dnd.mrp"/>
+ </component>
+ <component name="dndconfig" long-name="DND Config" introduced="7.0" purpose="mandatory" filter="test" class="config">
+ <unit mrp="/sf/os/networkingsrv/tcpiputils/dnd/group/networking_dnd-config.mrp" bldFile="/sf/os/networkingsrv/tcpiputils/dnd/data"/>
+ </component>
+ <component name="dhcp" long-name="DHCP" introduced="8.0" purpose="optional">
+ <unit bldFile="/sf/os/networkingsrv/tcpiputils/dhcp/group" mrp="/sf/os/networkingsrv/tcpiputils/dhcp/group/networking_dhcp.mrp"/>
+ </component>
+ <component name="networkaddressandporttranslation" long-name="Network Address and Port Translation" introduced="^2" purpose="mandatory" plugin="Y">
+ <unit bldFile="/sf/os/networkingsrv/tcpiputils/networkaddressandporttranslation/group" mrp="/sf/os/networkingsrv/tcpiputils/networkaddressandporttranslation/group/networking_napt.mrp"/>
+ </component>
+ <component name="punycodeconv" long-name="Punycode Converter" introduced="^3" purpose="mandatory">
+ <unit bldFile="/sf/os/networkingsrv/tcpiputils/punycodeconv/group" mrp="/sf/os/networkingsrv/tcpiputils/punycodeconv/group/networking_punycodeconverter.mrp"/>
+ </component>
+ </collection>
+ <collection name="linklayercontrol" long-name="Link Layer Control" level="hw-if">
+ <component name="nullagt" long-name="NULL AGT" introduced="7.0s" purpose="optional" plugin="Y">
+ <unit bldFile="/sf/os/networkingsrv/linklayercontrol/nullagt/group" mrp="/sf/os/networkingsrv/linklayercontrol/nullagt/group/networking_nullagt.mrp"/>
+ </component>
+ <component name="genericscprparameters" long-name="Generic SCPR Parameters" introduced="^3" purpose="optional">
+ <unit bldFile="/sf/os/networkingsrv/linklayercontrol/genericscprparameters/group" mrp="/sf/os/networkingsrv/linklayercontrol/genericscprparameters/group/networking_genericscprparams.mrp"/>
+ </component>
+ <component name="mbmsparameters" long-name="MBMS Parameters" introduced="^3" purpose="optional" plugin="Y">
+ <unit bldFile="/sf/os/networkingsrv/linklayercontrol/mbmsparameters/group" mrp="/sf/os/networkingsrv/linklayercontrol/mbmsparameters/group/networking_mbmsparams.mrp"/>
+ </component>
+ <component name="networkinterfacemgr" long-name="Network Interface Manager" introduced="ER5U" purpose="mandatory">
+ <unit bldFile="/sf/os/networkingsrv/linklayercontrol/networkinterfacemgr/group" mrp="/sf/os/networkingsrv/linklayercontrol/networkinterfacemgr/group/comms-infras_nifman.mrp" version="2"/>
+ </component>
+ </collection>
+ <collection name="linklayerprotocols" long-name="Link Layer Protocols" level="hw-if">
+ <component name="ethernetnif" long-name="Ethernet NIF" purpose="optional" plugin="Y">
+ <unit bldFile="/sf/os/networkingsrv/linklayerprotocols/ethernetnif/group" mrp="/sf/os/networkingsrv/linklayerprotocols/ethernetnif/group/networking_ether802.mrp"/>
+ </component>
+ <component name="ethernetpacketdriver" long-name="Ethernet Packet Driver" introduced="7.0" purpose="optional" filter="test" plugin="Y">
+ <unit mrp="/sf/os/networkingsrv/linklayerprotocols/ethernetpacketdriver/group/networking_etherdrv_srconly.mrp" bldFile="/sf/os/networkingsrv/linklayerprotocols/ethernetpacketdriver/group"/>
+ </component>
+ <component name="pppnif" long-name="PPP NIF" introduced="ER5" purpose="optional" plugin="Y">
+ <unit bldFile="/sf/os/networkingsrv/linklayerprotocols/pppnif/group" mrp="/sf/os/networkingsrv/linklayerprotocols/pppnif/group/networking_ppp.mrp" version="2"/>
+ </component>
+ <component name="pppconfig" long-name="PPP Config" introduced="ER5" purpose="optional" filter="test" class="config">
+ <unit mrp="/sf/os/networkingsrv/linklayerprotocols/pppnif/group/networking_ppp-config.mrp" bldFile="/sf/os/networkingsrv/linklayerprotocols/pppnif/data" version="2"/>
+ </component>
+ <component name="slipnif" long-name="SLIP NIF" purpose="development" plugin="Y">
+ <unit bldFile="/sf/os/networkingsrv/linklayerprotocols/slipnif/group" mrp="/sf/os/networkingsrv/linklayerprotocols/slipnif/group/networking_slip.mrp"/>
+ </component>
+ <component name="tunnelnif" long-name="Tunnel NIF" introduced="7.0s" purpose="optional" plugin="Y">
+ <unit bldFile="/sf/os/networkingsrv/linklayerprotocols/tunnelnif/group" mrp="/sf/os/networkingsrv/linklayerprotocols/tunnelnif/group/networking_tunnelnif.mrp"/>
+ </component>
+ </collection>
+ <collection name="linklayerutils" long-name="Link Layer Utilities" level="hw-if">
+ <component name="packetlogger" long-name="Packet Logger" introduced="8.1" purpose="development">
+ <unit bldFile="/sf/os/networkingsrv/linklayerutils/packetlogger/group" mrp="/sf/os/networkingsrv/linklayerutils/packetlogger/group/networking_packetlogger.mrp"/>
+ </component>
+ </collection>
+ <collection name="networkcontrol" long-name="Network Control" level="plugin">
+ <component name="qosfwconfig" long-name="QoS Framework Config" introduced="7.0s" purpose="optional" filter="test" class="config">
+ <unit mrp="/sf/os/networkingsrv/networkcontrol/qosfwconfig/qos/group/networking_qos-config.mrp" bldFile="/sf/os/networkingsrv/networkcontrol/qosfwconfig/qos/data"/>
+ </component>
+ <component name="qoslib" long-name="QoS Library" introduced="7.0s" purpose="optional">
+ <unit bldFile="/sf/os/networkingsrv/networkcontrol/qoslib/group" mrp="/sf/os/networkingsrv/networkcontrol/qoslib/group/networking_qoslib.mrp"/>
+ </component>
+ <component name="pfqoslib" long-name="PF QoS Library" introduced="7.0s" purpose="optional">
+ <unit bldFile="/sf/os/networkingsrv/networkcontrol/pfqoslib/group" mrp="/sf/os/networkingsrv/networkcontrol/pfqoslib/group/networking_pfqoslib.mrp"/>
+ </component>
+ <component name="qosfwprt" long-name="QoS Framework PRT" introduced="7.0s" purpose="optional" plugin="Y">
+ <unit bldFile="/sf/os/networkingsrv/networkcontrol/qosfwconfig/qos/group" mrp="/sf/os/networkingsrv/networkcontrol/qosfwconfig/qos/group/networking_qos.mrp"/>
+ </component>
+ <component name="qosipscpr" long-name="QoS IP SCPR" purpose="optional" plugin="Y">
+ <unit bldFile="/sf/os/networkingsrv/networkcontrol/qosipscpr/group" mrp="/sf/os/networkingsrv/networkcontrol/qosipscpr/group/networking_qosipscpr.mrp"/>
+ </component>
+ <component name="ipnetworklayer" long-name="IP Network Layer" introduced="^3" purpose="optional" plugin="Y">
+ <unit bldFile="/sf/os/networkingsrv/networkcontrol/ipnetworklayer/group" mrp="/sf/os/networkingsrv/networkcontrol/ipnetworklayer/group/networking_ipproto.mrp"/>
+ </component>
+ <component name="iptransportlayer" long-name="IP Transport Layer" introduced="^3" purpose="optional" plugin="Y">
+ <unit bldFile="/sf/os/networkingsrv/networkcontrol/iptransportlayer/group" mrp="/sf/os/networkingsrv/networkcontrol/iptransportlayer/group/networking_iptransport.mrp"/>
+ </component>
+ <component name="commsuserpromptmgr" long-name="Comms User Prompt Manager" introduced="^3" purpose="mandatory">
+ <unit bldFile="/sf/os/networkingsrv/networkcontrol/commsuserpromptmgr/group" mrp="/sf/os/networkingsrv/networkcontrol/commsuserpromptmgr/group/networking_netups.mrp"/>
+ </component>
+ </collection>
+ <collection name="networkprotocols" long-name="Network Protocols" level="plugin">
+ <component name="tcpipv4config" long-name="TCP/IPv4/v6 Config" introduced="7.0" purpose="mandatory" filter="test" class="config">
+ <unit mrp="/sf/os/networkingsrv/networkprotocols/tcpipv4v6prt/group/networking_tcpip6-config.mrp" bldFile="/sf/os/networkingsrv/networkprotocols/tcpipv4v6prt/data"/>
+ </component>
+ <component name="ipeventnotifier" long-name="IP Event Notifier" introduced="8.1" purpose="mandatory" plugin="Y">
+ <unit bldFile="/sf/os/networkingsrv/networkprotocols/ipeventnotifier/group" mrp="/sf/os/networkingsrv/networkprotocols/ipeventnotifier/group/networking_ipeventnotifier.mrp"/>
+ </component>
+ <component name="tcpipv4v6prt" long-name="TCP/IPv4/v6 PRT" introduced="7.0" purpose="mandatory" plugin="Y">
+ <unit bldFile="/sf/os/networkingsrv/networkprotocols/tcpipv4v6prt/group" mrp="/sf/os/networkingsrv/networkprotocols/tcpipv4v6prt/group/networking_tcpip6.mrp"/>
+ </component>
+ <component name="iphook" long-name="IP Hook" introduced="7.0" purpose="mandatory">
+ <unit bldFile="/sf/os/networkingsrv/networkprotocols/iphook/inhook6/group" mrp="/sf/os/networkingsrv/networkprotocols/iphook/inhook6/group/networking_inhook6.mrp"/>
+ </component>
+ <component name="mobileip" long-name="Mobile IP" introduced="8.1" purpose="optional" plugin="Y">
+ <unit bldFile="/sf/os/networkingsrv/networkprotocols/mobileip/group" mrp="/sf/os/networkingsrv/networkprotocols/mobileip/group/networking_mobileip.mrp"/>
+ </component>
+ <component name="dnsproxy" long-name="DNS Proxy" introduced="^3" purpose="optional">
+ <unit bldFile="/sf/os/networkingsrv/networkprotocols/dnsproxy/group" mrp="/sf/os/networkingsrv/networkprotocols/dnsproxy/group/networking_dnsproxy.mrp"/>
+ </component>
+ </collection>
+ <collection name="networksecurity" long-name="Network Security" level="framework">
+ <component name="tls" long-name="TLS" introduced="6.0" purpose="mandatory">
+ <unit bldFile="/sf/os/networkingsrv/networksecurity/tls/group" mrp="/sf/os/networkingsrv/networksecurity/tls/group/networking_tls.mrp"/>
+ </component>
+ <component name="tlsprovider" long-name="TLS Provider" introduced="8.1" purpose="mandatory">
+ <unit bldFile="/sf/os/networkingsrv/networksecurity/tlsprovider/group" mrp="/sf/os/networkingsrv/networksecurity/tlsprovider/group/security_tlsprovider.mrp"/>
+ </component>
+ <component name="ipsec" long-name="IPsec" introduced="7.0" purpose="optional">
+ <unit bldFile="/sf/os/networkingsrv/networksecurity/ipsec/group" mrp="/sf/os/networkingsrv/networksecurity/ipsec/group/networking_ipsec.mrp"/>
+ </component>
+ </collection>
+ <collection name="networkingtestandutils" long-name="Networking Test and Utils" level="app-if">
+ <component name="networkingunittest" long-name="Networking Unit Test" introduced="7.0" purpose="development" filter="test">
+ <unit mrp="/sf/os/networkingsrv/networkingtestandutils/networkingunittest/group/networking_unittest.mrp" bldFile="/sf/os/networkingsrv/networkingtestandutils/networkingunittest/group"/>
+ </component>
+ <component name="networkingexamples" long-name="Networking Examples" introduced="7.0" purpose="development">
+ <unit bldFile="/sf/os/networkingsrv/networkingtestandutils/networkingexamples/examplecode/group" mrp="/sf/os/networkingsrv/networkingtestandutils/networkingexamples/examplecode/group/networking_examplecode.mrp"/>
+ </component>
+ <component name="exampleinternetutilities" long-name="Example Internet Utilities" introduced="ER5" purpose="development" filter="test">
+ <unit mrp="/sf/os/networkingsrv/networkingtestandutils/exampleinternetutilities/group/networking_inetutil.mrp" bldFile="/sf/os/networkingsrv/networkingtestandutils/exampleinternetutilities/group"/>
+ </component>
+ <component name="ipprobe" long-name="IP Probe" introduced="7.0s" purpose="development" filter="test" plugin="Y">
+ <unit mrp="/sf/os/networkingsrv/networkingtestandutils/ipprobe/group/networking_probe.mrp" bldFile="/sf/os/networkingsrv/networkingtestandutils/ipprobe/group"/>
+ </component>
+ <component name="ipv6to4tunnel" long-name="IPv6 to 4 Tunnel" purpose="development" filter="test" plugin="Y">
+ <unit mrp="/sf/os/networkingsrv/networkingtestandutils/ipv6to4tunnel/group/networking_6to4.mrp" bldFile="/sf/os/networkingsrv/networkingtestandutils/ipv6to4tunnel/group"/>
+ </component>
+ <component name="ipanalyzer" long-name="IP Analyzer" deprecated="^3" introduced="7.0" purpose="development" filter="test">
+ <unit mrp="/sf/os/networkingsrv/networkingtestandutils/ipanalyzer/group/networking_iprotor.mrp" bldFile="/sf/os/networkingsrv/networkingtestandutils/ipanalyzer/group"/>
+ </component>
+ <component name="networkingintegrationtest" long-name="Networking Integration Test" introduced="ER5" purpose="development">
+ <unit bldFile="/sf/os/networkingsrv/networkingtestandutils/networkingintegrationtest/Group" mrp="/sf/os/networkingsrv/networkingtestandutils/networkingintegrationtest/Group/networking_integrationtest.mrp"/>
+ </component>
+ <component name="networkingperformancemeasurementtools" long-name="Networking Performance Measurement Tools" introduced="^3" purpose="development">
+ <unit bldFile="/sf/os/networkingsrv/networkingtestandutils/networkingperformancemeasurementtools/group" mrp="/sf/os/networkingsrv/networkingtestandutils/networkingperformancemeasurementtools/group/networking_netperf.mrp"/>
+ </component>
+ </collection>
+ <collection name="networkingsrv_info" long-name="Networking Services Info" level="app-if">
+ <component name="networkingrom" long-name="Networking ROM" purpose="mandatory">
+ <!-- production component: contains the IBY files -->
+ <unit bldFile="/sf/os/networkingsrv/networkingsrv_info/networkingrom/group" mrp="/sf/os/networkingsrv/networkingsrv_info/networkingrom/group/networking_general.mrp"/>
+ </component>
+ <component name="networkingdocs" long-name="Networking Documentation" purpose="development" class="doc">
+ <unit mrp="/sf/os/networkingsrv/networkingsrv_info/networkingdocs/networking_documentation.mrp"/>
+ </component>
+ <component name="networkingsrv_metadata" long-name="Networking Services Metadata" introduced="^2" purpose="development" class="config PC">
+ <unit mrp="/sf/os/networkingsrv/networkingsrv_info/networkingsrv_metadata/networkingsrv_metadata.mrp"/>
+ </component>
+ </collection>
+ <collection name="pppcompressionplugins" long-name="PPP Compression Plugins" level="plugin">
+ <component name="predictorcompression" long-name="Predictor Compression" introduced="6.0" purpose="optional" plugin="Y">
+ <unit bldFile="/sf/os/networkingsrv/pppcompressionplugins/predictorcompression/group" mrp="/sf/os/networkingsrv/pppcompressionplugins/predictorcompression/group/networking_predcomp.mrp"/>
+ </component>
+ </collection>
+ </block>
+ </layer>
+ </systemModel>
+</SystemDefinition>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/symbian3/os/networkingsrv/package_definition_3.0.xml Mon Feb 15 18:25:55 2010 +0000
@@ -0,0 +1,171 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<SystemDefinition schema="3.0.0">
+ <package id="networkingsrv" name="Networking Services" levels="adaptation hw-if plugin framework server app-if">
+ <collection id="commsdb" name="Comms DB" level="server">
+ <component id="s60_commsdb" filter="s60" name="S60 Commsdb" class="config">
+ <unit bldFile="commsdb/s60_commsdb/group"/>
+ </component>
+ </collection>
+ <collection id="esockapiextensions" name="ESock API Extensions" level="app-if">
+ <component id="internetsockets" name="Internet Sockets" introduced="ER5" purpose="mandatory">
+ <unit bldFile="esockapiextensions/internetsockets/group" mrp="esockapiextensions/internetsockets/group/networking_insock.mrp"/>
+ </component>
+ </collection>
+ <collection id="tcpiputils" name="TCP/IP Utilities" level="plugin">
+ <component id="dnd" name="DND" introduced="7.0" purpose="mandatory">
+ <unit bldFile="tcpiputils/dnd/group" mrp="tcpiputils/dnd/group/networking_dnd.mrp"/>
+ </component>
+ <component id="dndconfig" name="DND Config" introduced="7.0" purpose="mandatory" class="config" filter="test">
+ <unit mrp="tcpiputils/dnd/group/networking_dnd-config.mrp" bldFile="tcpiputils/dnd/data"/>
+ </component>
+ <component id="dhcp" name="DHCP" introduced="8.0" purpose="optional">
+ <unit bldFile="tcpiputils/dhcp/group" mrp="tcpiputils/dhcp/group/networking_dhcp.mrp"/>
+ </component>
+ <component id="networkaddressandporttranslation" name="Network Address and Port Translation" introduced="^2" purpose="mandatory" class="plugin">
+ <unit bldFile="tcpiputils/networkaddressandporttranslation/group" mrp="tcpiputils/networkaddressandporttranslation/group/networking_napt.mrp"/>
+ </component>
+ <component id="punycodeconv" name="Punycode Converter" introduced="^3" purpose="mandatory">
+ <unit bldFile="tcpiputils/punycodeconv/group" mrp="tcpiputils/punycodeconv/group/networking_punycodeconverter.mrp"/>
+ </component>
+ </collection>
+ <collection id="linklayercontrol" name="Link Layer Control" level="hw-if">
+ <component id="nullagt" name="NULL AGT" introduced="7.0s" purpose="optional" class="plugin">
+ <unit bldFile="linklayercontrol/nullagt/group" mrp="linklayercontrol/nullagt/group/networking_nullagt.mrp"/>
+ </component>
+ <component id="genericscprparameters" name="Generic SCPR Parameters" introduced="^3" purpose="optional">
+ <unit bldFile="linklayercontrol/genericscprparameters/group" mrp="linklayercontrol/genericscprparameters/group/networking_genericscprparams.mrp"/>
+ </component>
+ <component id="mbmsparameters" name="MBMS Parameters" introduced="^3" purpose="optional" class="plugin">
+ <unit bldFile="linklayercontrol/mbmsparameters/group" mrp="linklayercontrol/mbmsparameters/group/networking_mbmsparams.mrp"/>
+ </component>
+ <component id="networkinterfacemgr" name="Network Interface Manager" introduced="ER5U" purpose="mandatory">
+ <unit version="2" bldFile="linklayercontrol/networkinterfacemgr/group" mrp="linklayercontrol/networkinterfacemgr/group/comms-infras_nifman.mrp"/>
+ </component>
+ </collection>
+ <collection id="linklayerprotocols" name="Link Layer Protocols" level="hw-if">
+ <component id="ethernetnif" name="Ethernet NIF" purpose="optional" class="plugin">
+ <unit bldFile="linklayerprotocols/ethernetnif/group" mrp="linklayerprotocols/ethernetnif/group/networking_ether802.mrp"/>
+ </component>
+ <component id="ethernetpacketdriver" name="Ethernet Packet Driver" introduced="7.0" purpose="optional" class="plugin" filter="test">
+ <unit mrp="linklayerprotocols/ethernetpacketdriver/group/networking_etherdrv_srconly.mrp" bldFile="linklayerprotocols/ethernetpacketdriver/group"/>
+ </component>
+ <component id="pppnif" name="PPP NIF" introduced="ER5" purpose="optional" class="plugin">
+ <unit version="2" bldFile="linklayerprotocols/pppnif/group" mrp="linklayerprotocols/pppnif/group/networking_ppp.mrp"/>
+ </component>
+ <component id="pppconfig" name="PPP Config" introduced="ER5" purpose="optional" class="config" filter="test">
+ <unit version="2" mrp="linklayerprotocols/pppnif/group/networking_ppp-config.mrp" bldFile="linklayerprotocols/pppnif/data"/>
+ </component>
+ <component id="slipnif" name="SLIP NIF" purpose="development" class="plugin">
+ <unit bldFile="linklayerprotocols/slipnif/group" mrp="linklayerprotocols/slipnif/group/networking_slip.mrp"/>
+ </component>
+ <component id="tunnelnif" name="Tunnel NIF" introduced="7.0s" purpose="optional" class="plugin">
+ <unit bldFile="linklayerprotocols/tunnelnif/group" mrp="linklayerprotocols/tunnelnif/group/networking_tunnelnif.mrp"/>
+ </component>
+ </collection>
+ <collection id="linklayerutils" name="Link Layer Utilities" level="hw-if">
+ <component id="packetlogger" name="Packet Logger" introduced="8.1" purpose="development">
+ <unit bldFile="linklayerutils/packetlogger/group" mrp="linklayerutils/packetlogger/group/networking_packetlogger.mrp"/>
+ </component>
+ </collection>
+ <collection id="networkcontrol" name="Network Control" level="plugin">
+ <component id="qosfwconfig" name="QoS Framework Config" introduced="7.0s" purpose="optional" class="config" filter="test">
+ <unit mrp="networkcontrol/qosfwconfig/qos/group/networking_qos-config.mrp" bldFile="networkcontrol/qosfwconfig/qos/data"/>
+ </component>
+ <component id="qoslib" name="QoS Library" introduced="7.0s" purpose="optional">
+ <unit bldFile="networkcontrol/qoslib/group" mrp="networkcontrol/qoslib/group/networking_qoslib.mrp"/>
+ </component>
+ <component id="pfqoslib" name="PF QoS Library" introduced="7.0s" purpose="optional">
+ <unit bldFile="networkcontrol/pfqoslib/group" mrp="networkcontrol/pfqoslib/group/networking_pfqoslib.mrp"/>
+ </component>
+ <component id="qosfwprt" name="QoS Framework PRT" introduced="7.0s" purpose="optional" class="plugin">
+ <unit bldFile="networkcontrol/qosfwconfig/qos/group" mrp="networkcontrol/qosfwconfig/qos/group/networking_qos.mrp"/>
+ </component>
+ <component id="qosipscpr" name="QoS IP SCPR" purpose="optional" class="plugin">
+ <unit bldFile="networkcontrol/qosipscpr/group" mrp="networkcontrol/qosipscpr/group/networking_qosipscpr.mrp"/>
+ </component>
+ <component id="ipnetworklayer" name="IP Network Layer" introduced="^3" purpose="optional" class="plugin">
+ <unit bldFile="networkcontrol/ipnetworklayer/group" mrp="networkcontrol/ipnetworklayer/group/networking_ipproto.mrp"/>
+ </component>
+ <component id="iptransportlayer" name="IP Transport Layer" introduced="^3" purpose="optional" class="plugin">
+ <unit bldFile="networkcontrol/iptransportlayer/group" mrp="networkcontrol/iptransportlayer/group/networking_iptransport.mrp"/>
+ </component>
+ <component id="commsuserpromptmgr" name="Comms User Prompt Manager" introduced="^3" purpose="mandatory">
+ <unit bldFile="networkcontrol/commsuserpromptmgr/group" mrp="networkcontrol/commsuserpromptmgr/group/networking_netups.mrp"/>
+ </component>
+ </collection>
+ <collection id="networkprotocols" name="Network Protocols" level="plugin">
+ <component id="tcpipv4config" name="TCP/IPv4/v6 Config" introduced="7.0" purpose="mandatory" class="config" filter="test">
+ <unit mrp="networkprotocols/tcpipv4v6prt/group/networking_tcpip6-config.mrp" bldFile="networkprotocols/tcpipv4v6prt/data"/>
+ </component>
+ <component id="ipeventnotifier" name="IP Event Notifier" introduced="8.1" purpose="mandatory" class="plugin">
+ <unit bldFile="networkprotocols/ipeventnotifier/group" mrp="networkprotocols/ipeventnotifier/group/networking_ipeventnotifier.mrp"/>
+ </component>
+ <component id="tcpipv4v6prt" name="TCP/IPv4/v6 PRT" introduced="7.0" purpose="mandatory" class="plugin">
+ <unit bldFile="networkprotocols/tcpipv4v6prt/group" mrp="networkprotocols/tcpipv4v6prt/group/networking_tcpip6.mrp"/>
+ </component>
+ <component id="iphook" name="IP Hook" introduced="7.0" purpose="mandatory">
+ <unit bldFile="networkprotocols/iphook/inhook6/group" mrp="networkprotocols/iphook/inhook6/group/networking_inhook6.mrp"/>
+ </component>
+ <component id="mobileip" name="Mobile IP" introduced="8.1" purpose="optional" class="plugin">
+ <unit bldFile="networkprotocols/mobileip/group" mrp="networkprotocols/mobileip/group/networking_mobileip.mrp"/>
+ </component>
+ <component id="dnsproxy" name="DNS Proxy" introduced="^3" purpose="optional">
+ <unit bldFile="networkprotocols/dnsproxy/group" mrp="networkprotocols/dnsproxy/group/networking_dnsproxy.mrp"/>
+ </component>
+ </collection>
+ <collection id="networksecurity" name="Network Security" level="framework">
+ <component id="tls" name="TLS" introduced="6.0" purpose="mandatory">
+ <unit bldFile="networksecurity/tls/group" mrp="networksecurity/tls/group/networking_tls.mrp"/>
+ </component>
+ <component id="tlsprovider" name="TLS Provider" introduced="8.1" purpose="mandatory">
+ <unit bldFile="networksecurity/tlsprovider/group" mrp="networksecurity/tlsprovider/group/security_tlsprovider.mrp"/>
+ </component>
+ <component id="ipsec" name="IPsec" introduced="7.0" purpose="optional">
+ <unit bldFile="networksecurity/ipsec/group" mrp="networksecurity/ipsec/group/networking_ipsec.mrp"/>
+ </component>
+ </collection>
+ <collection id="networkingtestandutils" name="Networking Test and Utils" level="app-if">
+ <component id="networkingunittest" name="Networking Unit Test" introduced="7.0" purpose="development" filter="test">
+ <unit mrp="networkingtestandutils/networkingunittest/group/networking_unittest.mrp" bldFile="networkingtestandutils/networkingunittest/group"/>
+ </component>
+ <component id="networkingexamples" name="Networking Examples" introduced="7.0" purpose="development">
+ <unit bldFile="networkingtestandutils/networkingexamples/examplecode/group" mrp="networkingtestandutils/networkingexamples/examplecode/group/networking_examplecode.mrp"/>
+ </component>
+ <component id="exampleinternetutilities" name="Example Internet Utilities" introduced="ER5" purpose="development" filter="test">
+ <unit mrp="networkingtestandutils/exampleinternetutilities/group/networking_inetutil.mrp" bldFile="networkingtestandutils/exampleinternetutilities/group"/>
+ </component>
+ <component id="ipprobe" name="IP Probe" introduced="7.0s" purpose="development" class="plugin" filter="test">
+ <unit mrp="networkingtestandutils/ipprobe/group/networking_probe.mrp" bldFile="networkingtestandutils/ipprobe/group"/>
+ </component>
+ <component id="ipv6to4tunnel" name="IPv6 to 4 Tunnel" purpose="development" class="plugin" filter="test">
+ <unit mrp="networkingtestandutils/ipv6to4tunnel/group/networking_6to4.mrp" bldFile="networkingtestandutils/ipv6to4tunnel/group"/>
+ </component>
+ <component id="ipanalyzer" name="IP Analyzer" deprecated="^3" introduced="7.0" purpose="development" filter="test">
+ <unit mrp="networkingtestandutils/ipanalyzer/group/networking_iprotor.mrp" bldFile="networkingtestandutils/ipanalyzer/group"/>
+ </component>
+ <component id="networkingintegrationtest" name="Networking Integration Test" introduced="ER5" purpose="development">
+ <unit bldFile="networkingtestandutils/networkingintegrationtest/Group" mrp="networkingtestandutils/networkingintegrationtest/Group/networking_integrationtest.mrp"/>
+ </component>
+ <component id="networkingperformancemeasurementtools" name="Networking Performance Measurement Tools" introduced="^3" purpose="development">
+ <unit bldFile="networkingtestandutils/networkingperformancemeasurementtools/group" mrp="networkingtestandutils/networkingperformancemeasurementtools/group/networking_netperf.mrp"/>
+ </component>
+ </collection>
+ <collection id="networkingsrv_info" name="Networking Services Info" level="app-if">
+ <component id="networkingrom" name="Networking ROM" purpose="mandatory">
+ <!-- production component: contains the IBY files -->
+ <unit bldFile="networkingsrv_info/networkingrom/group" mrp="networkingsrv_info/networkingrom/group/networking_general.mrp"/>
+ </component>
+ <component id="networkingdocs" name="Networking Documentation" purpose="development" class="doc">
+ <unit mrp="networkingsrv_info/networkingdocs/networking_documentation.mrp"/>
+ </component>
+ <component id="networkingsrv_metadata" name="Networking Services Metadata" class="config" introduced="^2" purpose="development" target="desktop">
+ <unit mrp="networkingsrv_info/networkingsrv_metadata/networkingsrv_metadata.mrp"/>
+ </component>
+ </collection>
+ <collection id="pppcompressionplugins" name="PPP Compression Plugins" level="plugin">
+ <component id="predictorcompression" name="Predictor Compression" introduced="6.0" purpose="optional" class="plugin">
+ <unit bldFile="pppcompressionplugins/predictorcompression/group" mrp="pppcompressionplugins/predictorcompression/group/networking_predcomp.mrp"/>
+ </component>
+ </collection>
+ </package>
+</SystemDefinition>
--- a/symbian3/os/osrndtools/package_definition.xml Fri Feb 12 16:37:22 2010 +0000
+++ b/symbian3/os/osrndtools/package_definition.xml Mon Feb 15 18:25:55 2010 +0000
@@ -1,128 +1,209 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE SystemDefinition [
- <!ELEMENT SystemDefinition (systemModel?,SystemBuild?)>
- <!ATTLIST SystemDefinition
- name CDATA #REQUIRED
- schema CDATA #REQUIRED>
- <!ELEMENT systemModel (layer+)>
- <!ELEMENT layer (block*|collection*)*>
- <!ATTLIST layer
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED
- levels NMTOKENS #IMPLIED
- span CDATA #IMPLIED>
- <!ELEMENT block (subblock*|collection*)*>
- <!ATTLIST block
- levels NMTOKENS #IMPLIED
- span CDATA #IMPLIED
- level NMTOKEN #IMPLIED
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED>
- <!ELEMENT subblock (collection)*>
- <!ATTLIST subblock
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED>
- <!ELEMENT collection (component)*>
- <!ATTLIST collection
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED
- level NMTOKEN #IMPLIED>
- <!ELEMENT component (unit)*>
- <!ATTLIST component
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED
- deprecated CDATA #IMPLIED
- introduced CDATA #IMPLIED
- contract CDATA #IMPLIED
- plugin (Y|N) 'N'
- filter CDATA #IMPLIED
- class NMTOKENS #IMPLIED
- supports CDATA #IMPLIED
- purpose (optional|mandatory|development) 'optional'>
- <!ELEMENT unit EMPTY>
- <!ATTLIST unit
- mrp CDATA #IMPLIED
- filter CDATA #IMPLIED
- bldFile CDATA #IMPLIED
- root CDATA #IMPLIED
- version NMTOKEN #IMPLIED
- prebuilt NMTOKEN #IMPLIED
- late (Y|N) #IMPLIED
- priority CDATA #IMPLIED>
- <!ELEMENT SystemBuild (option*|target+|targetList+|list+|configuration+)*>
- <!ATTLIST SystemBuild schema CDATA #REQUIRED>
- <!ELEMENT list (ref+)>
- <!ATTLIST list
- name ID #REQUIRED
- description CDATA #REQUIRED>
- <!ELEMENT ref EMPTY>
- <!ATTLIST ref item CDATA #REQUIRED>
- <!ELEMENT targetList EMPTY>
- <!ATTLIST targetList
- name ID #REQUIRED
- description CDATA #REQUIRED
- target IDREFS #REQUIRED>
- <!ELEMENT target EMPTY>
- <!ATTLIST target
- name ID #REQUIRED
- abldTarget CDATA #REQUIRED
- description CDATA #REQUIRED>
- <!ELEMENT option EMPTY>
- <!ATTLIST option
- name ID #REQUIRED
- abldOption CDATA #REQUIRED
- description CDATA #REQUIRED
- enable (Y|N) #REQUIRED>
- <!ELEMENT configuration (listRef+|ref+|task+)*>
- <!ATTLIST configuration
- name ID #REQUIRED
- description CDATA #REQUIRED
- filter CDATA #REQUIRED>
- <!ELEMENT task (listRef*,(buildLayer|specialInstructions))>
- <!ELEMENT listRef EMPTY>
- <!ATTLIST listRef list CDATA #REQUIRED>
- <!ELEMENT buildLayer EMPTY>
- <!ATTLIST buildLayer
- command CDATA #REQUIRED
- targetList IDREFS #IMPLIED
- unitParallel (Y|N) #REQUIRED
- targetParallel (Y|N) 'N'>
- <!ELEMENT specialInstructions EMPTY>
- <!ATTLIST specialInstructions
- name CDATA #REQUIRED
- cwd CDATA #REQUIRED
- root CDATA #IMPLIED
- command CDATA #REQUIRED>
-]>
-<SystemDefinition schema="2.0.1" name="Symbian^3">
-<systemModel>
-<layer name="os" long-name="OS" levels="hw services">
-<block name="osrndtools" level="services" long-name="OS R&D tools" levels="fw trace">
-<collection name="testexecfw1" long-name="Test Execution Framework v1" level="fw">
-<component name="cinidata" long-name="CINI Data" purpose="development">
-<unit bldFile="/sf/os/osrndtools/testexecfw1/cinidata" mrp="/sf/os/osrndtools/testexecfw1/cinidata/tools_cinidata.mrp"/>
-</component>
-<component name="testexecute" long-name="Test Execute" deprecated="tb91" purpose="development">
-<unit bldFile="/sf/os/osrndtools/testexecfw1/testexecute/Group" mrp="/sf/os/osrndtools/testexecfw1/testexecute/Group/tools_testexecute.mrp"/>
-</component>
-</collection>
-<collection name="osrndtools_info" long-name="OS R&D tools Info" level="trace">
-<component name="osrndtools_metadata" long-name="OS R&D tools Metadata" introduced="tb91" purpose="development" class="config PC">
-<unit mrp="/sf/os/osrndtools/osrndtools_info/osrndtools_metadata/osrndtools_metadata.mrp"/>
-</component>
-</collection>
-<collection name="s60">
-<component name="tools_osrndtools_osrndtools_plat_hti_api">
-<unit bldFile="/sf/os/osrndtools/osrndtools_plat/hti_api/group" mrp=""/>
-</component>
-<component name="tools_osrndtools_hti">
-<unit bldFile="/sf/os/osrndtools/hti/group" mrp=""/>
-</component>
-<component name="osrndtools">
-<unit bldFile="/sf/os/osrndtools/group" mrp=""/>
-</component>
-</collection>
-</block>
-</layer>
-</systemModel>
-</SystemDefinition>
\ No newline at end of file
+<!DOCTYPE SystemDefinition [
+<!ELEMENT SystemDefinition ( systemModel )>
+<!ATTLIST SystemDefinition
+ name CDATA #REQUIRED
+ schema CDATA #REQUIRED
+>
+<!-- all paths are relative to the environment variable specified by the root attribute, or SOURCEROOT if not. -->
+
+<!-- System Model Section of DTD -->
+<!ELEMENT systemModel (layer+)>
+
+<!ELEMENT layer (block* | collection*)*>
+<!-- Kernel Services, Base Services, OS Services, Etc -->
+<!ATTLIST layer
+ name CDATA #REQUIRED
+ long-name CDATA #IMPLIED
+ levels NMTOKENS #IMPLIED
+ span CDATA #IMPLIED
+>
+
+<!ELEMENT block (subblock* | collection*)*>
+ <!-- Generic OS services, Comms Services, etc -->
+<!ATTLIST block
+ levels NMTOKENS #IMPLIED
+ span CDATA #IMPLIED
+ level NMTOKEN #IMPLIED
+ name CDATA #REQUIRED
+ long-name CDATA #IMPLIED
+>
+
+<!ELEMENT subblock (collection)*>
+<!-- Cellular Baseband Services, Networking Services, etc -->
+<!ATTLIST subblock
+ name CDATA #REQUIRED
+ long-name CDATA #IMPLIED
+>
+
+<!ELEMENT collection (component)*>
+<!-- Screen Driver, Content Handling, etc -->
+<!ATTLIST collection
+ name CDATA #REQUIRED
+ long-name CDATA #IMPLIED
+ level NMTOKEN #IMPLIED
+>
+
+<!ELEMENT component (unit)*>
+<!-- contains units or is a package or prebuilt -->
+<!ATTLIST component
+ name CDATA #REQUIRED
+ long-name CDATA #IMPLIED
+ deprecated CDATA #IMPLIED
+ introduced CDATA #IMPLIED
+ contract CDATA #IMPLIED
+ plugin (Y|N) "N"
+ filter CDATA #IMPLIED
+ class NMTOKENS #IMPLIED
+ supports CDATA #IMPLIED
+ purpose ( optional | mandatory | development ) "optional"
+>
+
+<!ELEMENT unit EMPTY >
+<!-- must be buildable (bld.inf) -->
+<!-- bldFile may someday be removed in favour of mrp -->
+<!ATTLIST unit
+ mrp CDATA #IMPLIED
+ filter CDATA #IMPLIED
+ bldFile CDATA #IMPLIED
+ root CDATA #IMPLIED
+ version NMTOKEN #IMPLIED
+ prebuilt NMTOKEN #IMPLIED
+ late (Y|N) #IMPLIED
+ priority CDATA #IMPLIED
+>
+]>
+<SystemDefinition name="Symbian^3" schema="2.0.1">
+ <systemModel>
+ <layer name="os" long-name="OS" levels="hw services">
+ <block name="osrndtools" level="services" long-name="OS R&D tools" levels="fw trace">
+ <collection name="stif" long-name="STIF" level="fw">
+ <component name="stif_plat" filter="s60" long-name="STIF Platform Interfaces" purpose="development" class="api">
+ <unit bldFile="/sf/os/osrndtools/stif/stif_plat/group"/>
+ </component>
+ <component name="testinterface" filter="s60" long-name="Test Interface" purpose="development">
+ <unit bldFile="/sf/os/osrndtools/stif/testinterface/group"/>
+ </component>
+ <component name="testserver" filter="s60" long-name="Test Server" purpose="development">
+ <unit bldFile="/sf/os/osrndtools/stif/testserver/group"/>
+ </component>
+ <component name="testengine" filter="s60" long-name="Test Engine" purpose="development">
+ <unit bldFile="/sf/os/osrndtools/stif/testengine/group"/>
+ </component>
+ <component name="testserverstarter" filter="s60" long-name="Test Server Starter" purpose="development">
+ <unit bldFile="/sf/os/osrndtools/stif/testserverstarter/group"/>
+ </component>
+ <component name="stiftfwif" filter="s60" long-name="STIF Test Framework Interface" purpose="development">
+ <unit bldFile="/sf/os/osrndtools/stif/stiftfwif/group"/>
+ </component>
+ <component name="consoleui" filter="s60" long-name="Console UI" purpose="development">
+ <unit bldFile="/sf/os/osrndtools/stif/consoleui/group"/>
+ </component>
+ <component name="testcombiner" filter="s60" long-name="Test Combiner" purpose="development">
+ <unit bldFile="/sf/os/osrndtools/stif/testcombiner/group"/>
+ </component>
+ <component name="demomodule" filter="s60" long-name="Demo Module" purpose="development">
+ <unit bldFile="/sf/os/osrndtools/stif/demomodule/group"/>
+ </component>
+ <component name="atslogger" filter="s60" long-name="ATS Logger" purpose="development">
+ <unit bldFile="/sf/os/osrndtools/stif/atslogger/group"/>
+ </component>
+ <component name="atsinterface" filter="s60" long-name="ATS Interface" purpose="development">
+ <unit bldFile="/sf/os/osrndtools/stif/atsinterface/group"/>
+ </component>
+ <component name="testscripter" filter="s60" long-name="Test Scripter" purpose="development">
+ <unit bldFile="/sf/os/osrndtools/stif/testscripter/group"/>
+ </component>
+ <component name="suevent" filter="s60" long-name="SU Event" purpose="development">
+ <unit bldFile="/sf/os/osrndtools/stif/suevent/group"/>
+ </component>
+ <component name="stifkerneltestclassbase" filter="s60" long-name="STIF Kernel Test Class Base" purpose="development">
+ <!-- uncomment the unit when configuration is in place, it's currently #included from stif_build -->
+ <!-- <unit bldFile="stif/stifkerneltestclassbase/group"/>-->
+ </component>
+ <component name="stif_build" filter="s60" long-name="STIF Build" purpose="development">
+ <!-- move exports into self-contained component. Remove this when configuration is in place-->
+ <unit bldFile="/sf/os/osrndtools/stif/group"/>
+ </component>
+ </collection>
+ <collection name="memspy" long-name="Memspy" level="trace">
+ <component name="memspy_plat" filter="s60" long-name="Memspy Platform Interfaces" purpose="development" class="api">
+ <unit bldFile="/sf/os/osrndtools/memspy/memspy_plat/group"/>
+ </component>
+ <component name="driver" filter="s60" long-name="Memspy Driver" purpose="development">
+ <unit bldFile="/sf/os/osrndtools/memspy/driver/group"/>
+ </component>
+ <component name="memspy_engine" filter="s60" long-name="Memspy Engine" purpose="development">
+ <unit bldFile="/sf/os/osrndtools/memspy/engine/group"/>
+ </component>
+ <component name="commandline" filter="s60" long-name="Memspy Command Line" purpose="development">
+ <unit bldFile="/sf/os/osrndtools/memspy/commandline/group"/>
+ </component>
+ <component name="console" filter="s60" long-name="Memspy Console" purpose="development">
+ <unit bldFile="/sf/os/osrndtools/memspy/console/group"/>
+ </component>
+ <component name="memspy_build" filter="s60" long-name="Memspy Build" purpose="development">
+ <!-- move exports into self-contained component.-->
+ <unit bldFile="/sf/os/osrndtools/memspy/group"/>
+ </component>
+ </collection>
+ <collection name="hti" long-name="Harmonized Test Interface" level="trace">
+ <component name="hti_plat" filter="s60" long-name="HTI Platform Interfaces" purpose="development" class="api">
+ <unit bldFile="/sf/os/osrndtools/hti/hti_plat/group"/>
+ </component>
+ <component name="hticfg" filter="s60" long-name="HTI Config" purpose="development">
+ <unit bldFile="/sf/os/osrndtools/hti/hticfg/group"/>
+ </component>
+ <component name="htiautostart" filter="s60" long-name="HTI Autostart" purpose="development">
+ <unit bldFile="/sf/os/osrndtools/hti/htiautostart/group"/>
+ </component>
+ <component name="htiframework" filter="s60" long-name="HTI Framework" purpose="development">
+ <unit bldFile="/sf/os/osrndtools/hti/htiframework/group"/>
+ </component>
+ <component name="hticommplugins" filter="s60" long-name="HTI Communication Plugins" purpose="development" plugin="Y">
+ <!-- need to #include these from a single unit or separate into component at the right directory level -->
+ <unit bldFile="/sf/os/osrndtools/hti/HtiCommPlugins/HtiBtCommPlugin/group"/>
+ <unit bldFile="/sf/os/osrndtools/hti/HtiCommPlugins/HtiIPCommPlugin/group"/>
+ <unit bldFile="/sf/os/osrndtools/hti/HtiCommPlugins/HtiSerialCommPlugin/group"/>
+ <unit bldFile="/sf/os/osrndtools/hti/HtiCommPlugins/HtiUsbSerialCommPlugin/group"/>
+ </component>
+ <component name="htiserviceplugins" filter="s60" long-name="HTI Service Plugins" purpose="development" plugin="Y">
+ <!-- need to #include these from a single unit or separate into component at the right directory level -->
+ <unit bldFile="/sf/os/osrndtools/hti/HtiServicePlugins/HtiAppServicePlugin/group"/>
+ <unit bldFile="/sf/os/osrndtools/hti/HtiServicePlugins/HtiEchoServicePlugin/group"/>
+ <unit bldFile="/sf/os/osrndtools/hti/HtiServicePlugins/HtiFtpServicePlugin/group"/>
+ <unit bldFile="/sf/os/osrndtools/hti/HtiServicePlugins/HtiIpProxyServicePlugin/group"/>
+ <unit bldFile="/sf/os/osrndtools/hti/HtiServicePlugins/HtiStifTfServicePlugin/group"/>
+ </component>
+ <component name="htifilehlp" filter="s60" long-name="HTI File Help" purpose="development">
+ <unit bldFile="/sf/os/osrndtools/hti/htifilehlp/group"/>
+ </component>
+ <component name="htiwatchdog" filter="s60" long-name="HTI Watchdog" purpose="development">
+ <unit bldFile="/sf/os/osrndtools/hti/htiwatchdog/group"/>
+ </component>
+ <component name="hti_build" filter="s60" long-name="HTI Build" purpose="development">
+ <!-- move exports into self-contained component.-->
+ <unit bldFile="/sf/os/osrndtools/hti/group"/>
+ </component>
+ </collection>
+ <collection name="testexecfw1" long-name="Test Execution Framework v1" level="fw">
+ <component name="cinidata" long-name="CINI Data" purpose="development">
+ <unit bldFile="/sf/os/osrndtools/testexecfw1/cinidata" mrp="/sf/os/osrndtools/testexecfw1/cinidata/tools_cinidata.mrp"/>
+ </component>
+ <component name="testexecute" long-name="Test Execute" deprecated="^2" purpose="development">
+ <unit bldFile="/sf/os/osrndtools/testexecfw1/testexecute/Group" mrp="/sf/os/osrndtools/testexecfw1/testexecute/Group/tools_testexecute.mrp"/>
+ </component>
+ </collection>
+ <collection name="osrndtools_info" long-name="OS R&D tools Info" level="trace">
+ <component name="osrndtools_plat" filter="s60" long-name="OS R&D tools Platform Interfaces" purpose="development" class="api">
+ <unit bldFile="/sf/os/osrndtools/osrndtools_plat/group"/>
+ <!-- currently empty. Remove? -->
+ </component>
+ <component name="osrndtools_metadata" long-name="OS R&D tools Metadata" introduced="^2" purpose="development" class="config PC">
+ <unit mrp="/sf/os/osrndtools/osrndtools_info/osrndtools_metadata/osrndtools_metadata.mrp"/>
+ </component>
+ </collection>
+ </block>
+ </layer>
+ </systemModel>
+</SystemDefinition>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/symbian3/os/osrndtools/package_definition_3.0.xml Mon Feb 15 18:25:55 2010 +0000
@@ -0,0 +1,136 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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>
+ <component id="testserver" filter="s60" name="Test Server" purpose="development">
+ <unit bldFile="stif/testserver/group"/>
+ </component>
+ <component id="testengine" filter="s60" name="Test Engine" purpose="development">
+ <unit bldFile="stif/testengine/group"/>
+ </component>
+ <component id="testserverstarter" filter="s60" name="Test Server Starter" purpose="development">
+ <unit bldFile="stif/testserverstarter/group"/>
+ </component>
+ <component id="stiftfwif" filter="s60" name="STIF Test Framework Interface" purpose="development">
+ <unit bldFile="stif/stiftfwif/group"/>
+ </component>
+ <component id="consoleui" filter="s60" name="Console UI" purpose="development">
+ <unit bldFile="stif/consoleui/group"/>
+ </component>
+ <component id="testcombiner" filter="s60" name="Test Combiner" purpose="development">
+ <unit bldFile="stif/testcombiner/group"/>
+ </component>
+ <component id="demomodule" filter="s60" name="Demo Module" purpose="development">
+ <unit bldFile="stif/demomodule/group"/>
+ </component>
+ <component id="atslogger" filter="s60" name="ATS Logger" purpose="development">
+ <unit bldFile="stif/atslogger/group"/>
+ </component>
+ <component id="atsinterface" filter="s60" name="ATS Interface" purpose="development">
+ <unit bldFile="stif/atsinterface/group"/>
+ </component>
+ <component id="testscripter" filter="s60" name="Test Scripter" purpose="development">
+ <unit bldFile="stif/testscripter/group"/>
+ </component>
+ <component id="suevent" filter="s60" name="SU Event" purpose="development">
+ <unit bldFile="stif/suevent/group"/>
+ </component>
+ <component id="stifkerneltestclassbase" filter="s60" name="STIF Kernel Test Class Base" purpose="development">
+ <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>
+ <component id="memspy_engine" filter="s60" name="Memspy Engine" purpose="development">
+ <unit bldFile="memspy/engine/group"/>
+ </component>
+ <component id="commandline" filter="s60" name="Memspy Command Line" purpose="development">
+ <unit bldFile="memspy/commandline/group"/>
+ </component>
+ <component id="console" filter="s60" name="Memspy Console" purpose="development">
+ <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="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>
+ <component id="htiwatchdog" filter="s60" name="HTI Watchdog" purpose="development">
+ <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>
+ <collection id="testexecfw1" name="Test Execution Framework v1" level="fw">
+ <component id="cinidata" name="CINI Data" purpose="development">
+ <unit bldFile="testexecfw1/cinidata" mrp="testexecfw1/cinidata/tools_cinidata.mrp"/>
+ </component>
+ <component id="testexecute" name="Test Execute" deprecated="^2" purpose="development">
+ <unit bldFile="testexecfw1/testexecute/Group" mrp="testexecfw1/testexecute/Group/tools_testexecute.mrp"/>
+ </component>
+ </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"/> <!-- 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"/>
+ </component>
+ </collection>
+ </package>
+</SystemDefinition>
--- a/symbian3/os/ossrv/package_definition.xml Fri Feb 12 16:37:22 2010 +0000
+++ b/symbian3/os/ossrv/package_definition.xml Mon Feb 15 18:25:55 2010 +0000
@@ -1,172 +1,213 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE SystemDefinition [
- <!ELEMENT SystemDefinition (systemModel?,SystemBuild?)>
- <!ATTLIST SystemDefinition
- name CDATA #REQUIRED
- schema CDATA #REQUIRED>
- <!ELEMENT systemModel (layer+)>
- <!ELEMENT layer (block*|collection*)*>
- <!ATTLIST layer
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED
- levels NMTOKENS #IMPLIED
- span CDATA #IMPLIED>
- <!ELEMENT block (subblock*|collection*)*>
- <!ATTLIST block
- levels NMTOKENS #IMPLIED
- span CDATA #IMPLIED
- level NMTOKEN #IMPLIED
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED>
- <!ELEMENT subblock (collection)*>
- <!ATTLIST subblock
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED>
- <!ELEMENT collection (component)*>
- <!ATTLIST collection
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED
- level NMTOKEN #IMPLIED>
- <!ELEMENT component (unit)*>
- <!ATTLIST component
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED
- deprecated CDATA #IMPLIED
- introduced CDATA #IMPLIED
- contract CDATA #IMPLIED
- plugin (Y|N) 'N'
- filter CDATA #IMPLIED
- class NMTOKENS #IMPLIED
- supports CDATA #IMPLIED
- purpose (optional|mandatory|development) 'optional'>
- <!ELEMENT unit EMPTY>
- <!ATTLIST unit
- mrp CDATA #IMPLIED
- filter CDATA #IMPLIED
- bldFile CDATA #IMPLIED
- root CDATA #IMPLIED
- version NMTOKEN #IMPLIED
- prebuilt NMTOKEN #IMPLIED
- late (Y|N) #IMPLIED
- priority CDATA #IMPLIED>
- <!ELEMENT SystemBuild (option*|target+|targetList+|list+|configuration+)*>
- <!ATTLIST SystemBuild schema CDATA #REQUIRED>
- <!ELEMENT list (ref+)>
- <!ATTLIST list
- name ID #REQUIRED
- description CDATA #REQUIRED>
- <!ELEMENT ref EMPTY>
- <!ATTLIST ref item CDATA #REQUIRED>
- <!ELEMENT targetList EMPTY>
- <!ATTLIST targetList
- name ID #REQUIRED
- description CDATA #REQUIRED
- target IDREFS #REQUIRED>
- <!ELEMENT target EMPTY>
- <!ATTLIST target
- name ID #REQUIRED
- abldTarget CDATA #REQUIRED
- description CDATA #REQUIRED>
- <!ELEMENT option EMPTY>
- <!ATTLIST option
- name ID #REQUIRED
- abldOption CDATA #REQUIRED
- description CDATA #REQUIRED
- enable (Y|N) #REQUIRED>
- <!ELEMENT configuration (listRef+|ref+|task+)*>
- <!ATTLIST configuration
- name ID #REQUIRED
- description CDATA #REQUIRED
- filter CDATA #REQUIRED>
- <!ELEMENT task (listRef*,(buildLayer|specialInstructions))>
- <!ELEMENT listRef EMPTY>
- <!ATTLIST listRef list CDATA #REQUIRED>
- <!ELEMENT buildLayer EMPTY>
- <!ATTLIST buildLayer
- command CDATA #REQUIRED
- targetList IDREFS #IMPLIED
- unitParallel (Y|N) #REQUIRED
- targetParallel (Y|N) 'N'>
- <!ELEMENT specialInstructions EMPTY>
- <!ATTLIST specialInstructions
- name CDATA #REQUIRED
- cwd CDATA #REQUIRED
- root CDATA #IMPLIED
- command CDATA #REQUIRED>
-]>
-<SystemDefinition schema="2.0.1" name="Symbian^3">
-<systemModel>
-<layer name="os" long-name="OS" levels="hw services">
-<block name="ossrv" level="services" long-name="Generic OS Services" levels="physical-abstraction app-libs encoding translation data-services utilities">
-<collection name="genericservices" long-name="Generic Services" level="utilities">
-<component name="s60compatibilityheaders" long-name="S60 Compatibility Headers" filter="gt" purpose="optional">
-<unit bldFile="/sf/os/ossrv/genericservices/s60compatibilityheaders/groupsymtb101sf" mrp="/sf/os/ossrv/genericservices/s60compatibilityheaders/groupsymtb101sf/tools_s60_header_compatsymtb101sf.mrp" version="tb101sf"/>
-</component>
-<component name="mimerecognitionfw" long-name="MIME Recognition Framework" purpose="mandatory">
-<unit bldFile="/sf/os/ossrv/genericservices/mimerecognitionfw/group" mrp="/sf/os/ossrv/genericservices/mimerecognitionfw/group/app-framework_emime.mrp"/>
-</component>
-<component name="systemagent" long-name="System Agent" introduced="9.0" purpose="mandatory">
-<unit bldFile="/sf/os/ossrv/genericservices/systemagent/group" mrp="/sf/os/ossrv/genericservices/systemagent/group/syslibs_sysagent2.mrp"/>
-</component>
-<component name="taskscheduler" long-name="Task Scheduler" introduced="6.0" purpose="optional">
-<unit bldFile="/sf/os/ossrv/genericservices/taskscheduler/group" mrp="/sf/os/ossrv/genericservices/taskscheduler/group/syslibs_schsvr.mrp"/>
-</component>
-<component name="activebackupclient" long-name="Active Backup Client" purpose="optional">
-<unit bldFile="/sf/os/ossrv/genericservices/activebackupclient/group" mrp="/sf/os/ossrv/genericservices/activebackupclient/group/connectivity_abclient.mrp"/>
-</component>
-<component name="syslibsdocs" long-name="Syslibs Documentation" purpose="development" class="doc">
-<unit mrp="/sf/os/ossrv/genericservices/syslibsdocs/syslibs_documentation.mrp"/>
-</component>
-<component name="httputils" long-name="HTTP Utilities Library" introduced="6.2" purpose="optional">
-<unit bldFile="/sf/os/ossrv/genericservices/httputils/group" mrp="/sf/os/ossrv/genericservices/httputils/group/application-protocols_inetprotutil.mrp"/>
-</component>
-</collection>
-<collection name="syslibsapitest" long-name="SysLibs API Tests" level="utilities">
-<component name="syslibssvs" long-name="Syslibs Verfication Suite" introduced="tb91" purpose="development">
-<unit mrp="/sf/os/ossrv/syslibsapitest/syslibssvs/group/syslibssvs.mrp"/>
-</component>
-</collection>
-<collection name="compressionlibs" long-name="Compression Libraries" level="data-services">
-<component name="ziplib" long-name="Zip Compression Library" introduced="6.0" purpose="mandatory">
-<unit bldFile="/sf/os/ossrv/compressionlibs/ziplib/group" mrp="/sf/os/ossrv/compressionlibs/ziplib/group/syslibs_ezlib2.mrp"/>
-</component>
-</collection>
-<collection name="genericopenlibs" long-name="Generic Open Libraries" level="translation">
-<component name="cstdlib" long-name="C Standard Library" introduced="ER5" purpose="optional">
-<unit bldFile="/sf/os/ossrv/genericopenlibs/cstdlib/group" mrp="/sf/os/ossrv/genericopenlibs/cstdlib/group/syslibs_stdlib.mrp"/>
-</component>
-<component name="cppstdlib" long-name="C++ Standard Library" introduced="tb92" purpose="mandatory">
-<unit bldFile="/sf/os/ossrv/genericopenlibs/cppstdlib/group" mrp="/sf/os/ossrv/genericopenlibs/cppstdlib/group/openenv_libstdcpp.mrp"/>
-</component>
-<component name="openenvcore" long-name="Open Environment Core" introduced="tb91" purpose="mandatory">
-<unit bldFile="/sf/os/ossrv/genericopenlibs/openenvcore/group" mrp="/sf/os/ossrv/genericopenlibs/openenvcore/group/openenv.mrp"/>
-</component>
-<component name="posixrealtimeextensions" long-name="POSIX Realtime Extensions" introduced="tb92" purpose="optional">
-<unit bldFile="/sf/os/ossrv/genericopenlibs/posixrealtimeextensions/group" mrp="/sf/os/ossrv/genericopenlibs/posixrealtimeextensions/group/oeaddons_librt.mrp"/>
-</component>
-</collection>
-<collection name="lowlevellibsandfws" long-name="Low Level Libraries and Frameworks" level="app-libs">
-<component name="pluginfw" long-name="Plugin Framework" introduced="6.2" purpose="mandatory">
-<unit bldFile="/sf/os/ossrv/lowlevellibsandfws/pluginfw/Group" mrp="/sf/os/ossrv/lowlevellibsandfws/pluginfw/Group/syslibs_ecom3.mrp" version="3"/>
-</component>
-<component name="apputils" long-name="Application Utilities" introduced="ER5" purpose="mandatory">
-<unit bldFile="/sf/os/ossrv/lowlevellibsandfws/apputils/group" mrp="/sf/os/ossrv/lowlevellibsandfws/apputils/group/syslibs_bafl.mrp"/>
-</component>
-<component name="genericusabilitylib" long-name="Generic Usability Library" introduced="tb92" purpose="mandatory">
-<unit bldFile="/sf/os/ossrv/lowlevellibsandfws/genericusabilitylib/group" mrp="/sf/os/ossrv/lowlevellibsandfws/genericusabilitylib/group/syslibs_euserhl.mrp"/>
-</component>
-</collection>
-<collection name="ossrv_info" long-name="Generic OS Services Info" level="utilities">
-<component name="ossrv_metadata" long-name="Generic OS Services Metadata" introduced="tb91" purpose="development" class="config PC">
-<unit mrp="/sf/os/ossrv/ossrv_info/ossrv_metadata/ossrv_metadata.mrp"/>
-</component>
-</collection>
-<collection name="s60">
-<component name="ossrv">
-<unit bldFile="/sf/os/ossrv/group" mrp=""/>
-</component>
-</collection>
-</block>
-</layer>
-</systemModel>
-</SystemDefinition>
\ No newline at end of file
+<!DOCTYPE SystemDefinition [
+<!ELEMENT SystemDefinition ( systemModel )>
+<!ATTLIST SystemDefinition
+ name CDATA #REQUIRED
+ schema CDATA #REQUIRED
+>
+<!-- all paths are relative to the environment variable specified by the root attribute, or SOURCEROOT if not. -->
+
+<!-- System Model Section of DTD -->
+<!ELEMENT systemModel (layer+)>
+
+<!ELEMENT layer (block* | collection*)*>
+<!-- Kernel Services, Base Services, OS Services, Etc -->
+<!ATTLIST layer
+ name CDATA #REQUIRED
+ long-name CDATA #IMPLIED
+ levels NMTOKENS #IMPLIED
+ span CDATA #IMPLIED
+>
+
+<!ELEMENT block (subblock* | collection*)*>
+ <!-- Generic OS services, Comms Services, etc -->
+<!ATTLIST block
+ levels NMTOKENS #IMPLIED
+ span CDATA #IMPLIED
+ level NMTOKEN #IMPLIED
+ name CDATA #REQUIRED
+ long-name CDATA #IMPLIED
+>
+
+<!ELEMENT subblock (collection)*>
+<!-- Cellular Baseband Services, Networking Services, etc -->
+<!ATTLIST subblock
+ name CDATA #REQUIRED
+ long-name CDATA #IMPLIED
+>
+
+<!ELEMENT collection (component)*>
+<!-- Screen Driver, Content Handling, etc -->
+<!ATTLIST collection
+ name CDATA #REQUIRED
+ long-name CDATA #IMPLIED
+ level NMTOKEN #IMPLIED
+>
+
+<!ELEMENT component (unit)*>
+<!-- contains units or is a package or prebuilt -->
+<!ATTLIST component
+ name CDATA #REQUIRED
+ long-name CDATA #IMPLIED
+ deprecated CDATA #IMPLIED
+ introduced CDATA #IMPLIED
+ contract CDATA #IMPLIED
+ plugin (Y|N) "N"
+ filter CDATA #IMPLIED
+ class NMTOKENS #IMPLIED
+ supports CDATA #IMPLIED
+ purpose ( optional | mandatory | development ) "optional"
+>
+
+<!ELEMENT unit EMPTY >
+<!-- must be buildable (bld.inf) -->
+<!-- bldFile may someday be removed in favour of mrp -->
+<!ATTLIST unit
+ mrp CDATA #IMPLIED
+ filter CDATA #IMPLIED
+ bldFile CDATA #IMPLIED
+ root CDATA #IMPLIED
+ version NMTOKEN #IMPLIED
+ prebuilt NMTOKEN #IMPLIED
+ late (Y|N) #IMPLIED
+ priority CDATA #IMPLIED
+>
+]>
+<SystemDefinition name="Symbian^3" schema="2.0.1">
+ <systemModel>
+ <layer name="os" long-name="OS" levels="hw services">
+ <block name="ossrv" level="services" long-name="Generic OS Services" levels="physical-abstraction app-libs encoding translation data-services utilities">
+ <collection name="stdlibs" long-name="Standard Libraries" level="translation">
+ <component name="libz" filter="s60" long-name="Z Compression Library">
+ <unit bldFile="/sf/os/ossrv/stdlibs/libz/group"/>
+ </component>
+ <component name="libcrypt" filter="s60" long-name="Crypt Library">
+ <unit bldFile="/sf/os/ossrv/stdlibs/libcrypt/group"/>
+ </component>
+ </collection>
+ <collection name="ssl" long-name="SSL" level="data-services">
+ <component name="libcrypto" filter="s60" long-name="Crypto Library">
+ <unit bldFile="/sf/os/ossrv/ssl/libcrypto/group"/>
+ </component>
+ <component name="libssl" filter="s60" purpose="development" long-name="SSL Library">
+ <unit bldFile="/sf/os/ossrv/ssl/libssl/group"/>
+ </component>
+ </collection>
+ <collection name="glib" long-name="GLib" level="utilities">
+ <component name="glibbackend" filter="s60" long-name="GLib Backend">
+ <unit bldFile="/sf/os/ossrv/glib/glibbackend/group"/>
+ </component>
+ <component name="libglib" filter="s60" long-name="GLib Library">
+ <unit bldFile="/sf/os/ossrv/glib/libglib/group"/>
+ </component>
+ <component name="libgthread" filter="s60" long-name="Libg Thread">
+ <unit bldFile="/sf/os/ossrv/glib/libgthread/group"/>
+ </component>
+ <component name="libgmodule" filter="s60" long-name="Libg Module">
+ <unit bldFile="/sf/os/ossrv/glib/libgmodule/group"/>
+ </component>
+ <component name="libgobject" filter="s60" long-name="Libg Object">
+ <unit bldFile="/sf/os/ossrv/glib/libgobject/group"/>
+ </component>
+ </collection>
+ <collection name="stdcpp" long-name="C++ Standard Library" level="translation">
+ <!-- collection is really a component. Needs to be moved down a directory -->
+ <component name="stdcpp_build" filter="s60" long-name="Stdcpp">
+ <unit bldFile="/sf/os/ossrv/stdcpp/group"/>
+ </component>
+ </collection>
+ <collection name="ofdbus" long-name="Open Foundation D-Bus" level="utilities">
+ <component name="dbus" filter="s60" long-name="D-Bus">
+ <unit bldFile="/sf/os/ossrv/ofdbus/dbus/group"/>
+ </component>
+ <component name="dbus-glib" filter="s60" long-name="D-Bus GLib">
+ <unit bldFile="/sf/os/ossrv/ofdbus/dbus-glib/group"/>
+ </component>
+ <component name="ofdbus_rom" filter="s60" long-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="/sf/os/ossrv/ofdbus/group"/>
+ </component>
+ </collection>
+ <collection name="utilitylibraries" long-name="Utility Libraries" level="encoding">
+ <component name="libutils" filter="s60" long-name="Utility Library">
+ <unit bldFile="/sf/os/ossrv/utilitylibraries/libutils/group"/>
+ </component>
+ </collection>
+ <collection name="genericservices" long-name="Generic Services" level="utilities">
+ <component name="s60compatibilityheaders" long-name="S60 Compatibility Headers" filter="gt" purpose="optional">
+ <unit bldFile="/sf/os/ossrv/genericservices/s60compatibilityheaders/groupsymtb101sf" mrp="/sf/os/ossrv/genericservices/s60compatibilityheaders/groupsymtb101sf/tools_s60_header_compatsymtb101sf.mrp" version="tb101sf"/>
+ </component>
+ <component name="mimerecognitionfw" long-name="MIME Recognition Framework" purpose="mandatory">
+ <unit bldFile="/sf/os/ossrv/genericservices/mimerecognitionfw/group" mrp="/sf/os/ossrv/genericservices/mimerecognitionfw/group/app-framework_emime.mrp"/>
+ </component>
+ <component name="systemagent" long-name="System Agent" introduced="9.0" purpose="mandatory">
+ <unit bldFile="/sf/os/ossrv/genericservices/systemagent/group" mrp="/sf/os/ossrv/genericservices/systemagent/group/syslibs_sysagent2.mrp"/>
+ </component>
+ <component name="taskscheduler" long-name="Task Scheduler" introduced="6.0" purpose="optional">
+ <unit bldFile="/sf/os/ossrv/genericservices/taskscheduler/group" mrp="/sf/os/ossrv/genericservices/taskscheduler/group/syslibs_schsvr.mrp"/>
+ </component>
+ <component name="activebackupclient" long-name="Active Backup Client" purpose="optional">
+ <unit bldFile="/sf/os/ossrv/genericservices/activebackupclient/group" mrp="/sf/os/ossrv/genericservices/activebackupclient/group/connectivity_abclient.mrp"/>
+ </component>
+ <component name="syslibsdocs" long-name="Syslibs Documentation" purpose="development" class="doc">
+ <unit mrp="/sf/os/ossrv/genericservices/syslibsdocs/syslibs_documentation.mrp"/>
+ </component>
+ <component name="httputils" long-name="HTTP Utilities Library" introduced="6.2" purpose="optional">
+ <unit bldFile="/sf/os/ossrv/genericservices/httputils/group" mrp="/sf/os/ossrv/genericservices/httputils/group/application-protocols_inetprotutil.mrp"/>
+ </component>
+ </collection>
+ <collection name="syslibsapitest" long-name="SysLibs API Tests" level="utilities">
+ <component name="syslibssvs" long-name="Syslibs Verfication Suite" introduced="^2" purpose="development" filter="test">
+ <unit mrp="/sf/os/ossrv/syslibsapitest/syslibssvs/group/syslibssvs.mrp" bldFile="/sf/os/ossrv/syslibsapitest/syslibssvs/group"/>
+ </component>
+ </collection>
+ <collection name="compressionlibs" long-name="Compression Libraries" level="data-services">
+ <component name="ziplib" long-name="Zip Compression Library" introduced="6.0" purpose="mandatory">
+ <unit bldFile="/sf/os/ossrv/compressionlibs/ziplib/group" mrp="/sf/os/ossrv/compressionlibs/ziplib/group/syslibs_ezlib2.mrp"/>
+ </component>
+ </collection>
+ <collection name="genericopenlibs" long-name="Generic Open Libraries" level="translation">
+ <component name="cstdlib" long-name="C Standard Library" introduced="ER5" purpose="optional">
+ <unit bldFile="/sf/os/ossrv/genericopenlibs/cstdlib/group" mrp="/sf/os/ossrv/genericopenlibs/cstdlib/group/syslibs_stdlib.mrp"/>
+ </component>
+ <component name="cppstdlib" long-name="C++ Standard Library" introduced="^3" purpose="mandatory">
+ <unit bldFile="/sf/os/ossrv/genericopenlibs/cppstdlib/group" mrp="/sf/os/ossrv/genericopenlibs/cppstdlib/group/openenv_libstdcpp.mrp"/>
+ </component>
+ <component name="openenvcore" long-name="Open Environment Core" introduced="^2" purpose="mandatory">
+ <unit bldFile="/sf/os/ossrv/genericopenlibs/openenvcore/group" mrp="/sf/os/ossrv/genericopenlibs/openenvcore/group/openenv.mrp"/>
+ </component>
+ <component name="posixrealtimeextensions" long-name="POSIX Realtime Extensions" introduced="^3" purpose="optional">
+ <unit bldFile="/sf/os/ossrv/genericopenlibs/posixrealtimeextensions/group" mrp="/sf/os/ossrv/genericopenlibs/posixrealtimeextensions/group/oeaddons_librt.mrp"/>
+ </component>
+ </collection>
+ <collection name="lowlevellibsandfws" long-name="Low Level Libraries and Frameworks" level="app-libs">
+ <component name="pluginfw" long-name="Plugin Framework" introduced="6.2" purpose="mandatory">
+ <unit bldFile="/sf/os/ossrv/lowlevellibsandfws/pluginfw/Group" mrp="/sf/os/ossrv/lowlevellibsandfws/pluginfw/Group/syslibs_ecom3.mrp" version="3"/>
+ </component>
+ <component name="apputils" long-name="Application Utilities" introduced="ER5" purpose="mandatory">
+ <unit bldFile="/sf/os/ossrv/lowlevellibsandfws/apputils/group" mrp="/sf/os/ossrv/lowlevellibsandfws/apputils/group/syslibs_bafl.mrp"/>
+ </component>
+ <component name="genericusabilitylib" long-name="Generic Usability Library" introduced="^3" purpose="mandatory">
+ <unit bldFile="/sf/os/ossrv/lowlevellibsandfws/genericusabilitylib/group" mrp="/sf/os/ossrv/lowlevellibsandfws/genericusabilitylib/group/syslibs_euserhl.mrp"/>
+ </component>
+ </collection>
+ <collection name="ossrv_info" long-name="Generic OS Services Info" level="utilities">
+ <component name="ossrv_build" filter="s60" long-name="Generic OS Services Build">
+ <!-- exports should be moved to individual components -->
+ <unit bldFile="/sf/os/ossrv/group"/>
+ </component>
+ <component name="ossrv_plat" filter="s60" long-name="Generic OS Services Platform Interfaces" class="api">
+ <unit bldFile="/sf/os/ossrv/ossrv_plat/libutils/group"/>
+ </component>
+ <component name="ossrv_pub" filter="s60" long-name="Generic OS Services Public Interfaces" class="api">
+ <unit bldFile="/sf/os/ossrv/ossrv_pub/group"/>
+ </component>
+ <component name="ossrv_metadata" long-name="Generic OS Services Metadata" introduced="^2" purpose="development" class="config PC">
+ <unit mrp="/sf/os/ossrv/ossrv_info/ossrv_metadata/ossrv_metadata.mrp"/>
+ </component>
+ </collection>
+ </block>
+ </layer>
+ </systemModel>
+</SystemDefinition>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/symbian3/os/ossrv/package_definition_3.0.xml Mon Feb 15 18:25:55 2010 +0000
@@ -0,0 +1,135 @@
+<?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="stdlibs" name="Standard Libraries" level="translation">
+ <component id="libz" filter="s60" name="Z Compression Library">
+ <unit bldFile="stdlibs/libz/group"/>
+ </component>
+ <component id="libcrypt" filter="s60" name="Crypt Library">
+ <unit bldFile="stdlibs/libcrypt/group"/>
+ </component>
+ </collection>
+ <collection id="ssl" name="SSL" level="data-services">
+ <component id="libcrypto" filter="s60" name="Crypto Library">
+ <unit bldFile="ssl/libcrypto/group"/>
+ </component>
+ <component id="libssl" filter="s60" purpose="development" name="SSL Library">
+ <unit bldFile="ssl/libssl/group"/>
+ </component>
+ </collection>
+ <collection id="glib" name="GLib" level="utilities">
+ <component id="glibbackend" filter="s60" name="GLib Backend">
+ <unit bldFile="glib/glibbackend/group"/>
+ </component>
+ <component id="libglib" filter="s60" name="GLib Library">
+ <unit bldFile="glib/libglib/group"/>
+ </component>
+ <component id="libgthread" filter="s60" name="Libg Thread">
+ <unit bldFile="glib/libgthread/group"/>
+ </component>
+ <component id="libgmodule" filter="s60" name="Libg Module">
+ <unit bldFile="glib/libgmodule/group"/>
+ </component>
+ <component id="libgobject" filter="s60" name="Libg Object">
+ <unit bldFile="glib/libgobject/group"/>
+ </component>
+ </collection>
+ <collection id="stdcpp" name="C++ Standard Library" level="translation">
+ <!-- collection is really a component. Needs to be moved down a directory -->
+ <component id="stdcpp_build" filter="s60" name="Stdcpp">
+ <unit bldFile="stdcpp/group"/>
+ </component>
+ </collection>
+ <collection id="ofdbus" name="Open Foundation D-Bus" level="utilities">
+ <component id="dbus" filter="s60" name="D-Bus">
+ <unit bldFile="ofdbus/dbus/group"/>
+ </component>
+ <component id="dbus-glib" filter="s60" name="D-Bus GLib">
+ <unit bldFile="ofdbus/dbus-glib/group"/>
+ </component>
+ <component id="ofdbus_rom" filter="s60" name="D-Bus ROM">
+ <!-- Contains IBY for for dbus. Should remove #includes to above components and move this down a directory
+ Consider moving IBY file to one of the above as well and removing this component entirely -->
+ <unit bldFile="ofdbus/group"/>
+ </component>
+ </collection>
+ <collection id="utilitylibraries" name="Utility Libraries" level="encoding">
+ <component id="libutils" filter="s60" name="Utility Library">
+ <unit bldFile="utilitylibraries/libutils/group"/>
+ </component>
+ </collection>
+ <collection id="genericservices" name="Generic Services" level="utilities">
+ <component id="s60compatibilityheaders" name="S60 Compatibility Headers" filter="gt" purpose="optional">
+ <unit version="tb101sf" bldFile="genericservices/s60compatibilityheaders/groupsymtb101sf" mrp="genericservices/s60compatibilityheaders/groupsymtb101sf/tools_s60_header_compatsymtb101sf.mrp"/>
+ </component>
+ <component id="mimerecognitionfw" name="MIME Recognition Framework" purpose="mandatory">
+ <unit bldFile="genericservices/mimerecognitionfw/group" mrp="genericservices/mimerecognitionfw/group/app-framework_emime.mrp"/>
+ </component>
+ <component id="systemagent" name="System Agent" introduced="9.0" purpose="mandatory">
+ <unit bldFile="genericservices/systemagent/group" mrp="genericservices/systemagent/group/syslibs_sysagent2.mrp"/>
+ </component>
+ <component id="taskscheduler" name="Task Scheduler" introduced="6.0" purpose="optional">
+ <unit bldFile="genericservices/taskscheduler/group" mrp="genericservices/taskscheduler/group/syslibs_schsvr.mrp"/>
+ </component>
+ <component id="activebackupclient" name="Active Backup Client" purpose="optional">
+ <unit bldFile="genericservices/activebackupclient/group" mrp="genericservices/activebackupclient/group/connectivity_abclient.mrp"/>
+ </component>
+ <component id="syslibsdocs" name="Syslibs Documentation" purpose="development" class="doc">
+ <unit mrp="genericservices/syslibsdocs/syslibs_documentation.mrp"/>
+ </component>
+ <component id="httputils" name="HTTP Utilities Library" introduced="6.2" purpose="optional">
+ <unit bldFile="genericservices/httputils/group" mrp="genericservices/httputils/group/application-protocols_inetprotutil.mrp"/>
+ </component>
+ </collection>
+ <collection id="syslibsapitest" name="SysLibs API Tests" level="utilities">
+ <component id="syslibssvs" name="Syslibs Verfication Suite" introduced="^2" purpose="development" filter="test">
+ <unit mrp="syslibsapitest/syslibssvs/group/syslibssvs.mrp" bldFile="syslibsapitest/syslibssvs/group"/>
+ </component>
+ </collection>
+ <collection id="compressionlibs" name="Compression Libraries" level="data-services">
+ <component id="ziplib" name="Zip Compression Library" introduced="6.0" purpose="mandatory">
+ <unit bldFile="compressionlibs/ziplib/group" mrp="compressionlibs/ziplib/group/syslibs_ezlib2.mrp"/>
+ </component>
+ </collection>
+ <collection id="genericopenlibs" name="Generic Open Libraries" level="translation">
+ <component id="cstdlib" name="C Standard Library" introduced="ER5" purpose="optional">
+ <unit bldFile="genericopenlibs/cstdlib/group" mrp="genericopenlibs/cstdlib/group/syslibs_stdlib.mrp"/>
+ </component>
+ <component id="cppstdlib" name="C++ Standard Library" introduced="^3" purpose="mandatory">
+ <unit bldFile="genericopenlibs/cppstdlib/group" mrp="genericopenlibs/cppstdlib/group/openenv_libstdcpp.mrp"/>
+ </component>
+ <component id="openenvcore" name="Open Environment Core" introduced="^2" purpose="mandatory">
+ <unit bldFile="genericopenlibs/openenvcore/group" mrp="genericopenlibs/openenvcore/group/openenv.mrp"/>
+ </component>
+ <component id="posixrealtimeextensions" name="POSIX Realtime Extensions" introduced="^3" purpose="optional">
+ <unit bldFile="genericopenlibs/posixrealtimeextensions/group" mrp="genericopenlibs/posixrealtimeextensions/group/oeaddons_librt.mrp"/>
+ </component>
+ </collection>
+ <collection id="lowlevellibsandfws" name="Low Level Libraries and Frameworks" level="app-libs">
+ <component id="pluginfw" name="Plugin Framework" introduced="6.2" purpose="mandatory">
+ <unit version="3" bldFile="lowlevellibsandfws/pluginfw/Group" mrp="lowlevellibsandfws/pluginfw/Group/syslibs_ecom3.mrp"/>
+ </component>
+ <component id="apputils" name="Application Utilities" introduced="ER5" purpose="mandatory">
+ <unit bldFile="lowlevellibsandfws/apputils/group" mrp="lowlevellibsandfws/apputils/group/syslibs_bafl.mrp"/>
+ </component>
+ <component id="genericusabilitylib" name="Generic Usability Library" introduced="^3" purpose="mandatory">
+ <unit bldFile="lowlevellibsandfws/genericusabilitylib/group" mrp="lowlevellibsandfws/genericusabilitylib/group/syslibs_euserhl.mrp"/>
+ </component>
+ </collection>
+ <collection id="ossrv_info" name="Generic OS Services Info" level="utilities">
+ <component id="ossrv_build" filter="s60" name="Generic OS Services Build">
+ <!-- exports should be moved to individual components -->
+ <unit bldFile="group"/>
+ </component>
+ <component id="ossrv_plat" filter="s60" name="Generic OS Services Platform Interfaces" class="api">
+ <unit bldFile="ossrv_plat/libutils/group"/>
+ </component>
+ <component id="ossrv_pub" filter="s60" name="Generic OS Services Public Interfaces" class="api">
+ <unit bldFile="ossrv_pub/group"/>
+ </component>
+ <component id="ossrv_metadata" name="Generic OS Services Metadata" class="config" introduced="^2" purpose="development" target="desktop">
+ <unit mrp="ossrv_info/ossrv_metadata/ossrv_metadata.mrp"/>
+ </component>
+ </collection>
+ </package>
+</SystemDefinition>
--- a/symbian3/os/persistentdata/package_definition.xml Fri Feb 12 16:37:22 2010 +0000
+++ b/symbian3/os/persistentdata/package_definition.xml Mon Feb 15 18:25:55 2010 +0000
@@ -1,153 +1,132 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE SystemDefinition [
- <!ELEMENT SystemDefinition (systemModel?,SystemBuild?)>
- <!ATTLIST SystemDefinition
- name CDATA #REQUIRED
- schema CDATA #REQUIRED>
- <!ELEMENT systemModel (layer+)>
- <!ELEMENT layer (block*|collection*)*>
- <!ATTLIST layer
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED
- levels NMTOKENS #IMPLIED
- span CDATA #IMPLIED>
- <!ELEMENT block (subblock*|collection*)*>
- <!ATTLIST block
- levels NMTOKENS #IMPLIED
- span CDATA #IMPLIED
- level NMTOKEN #IMPLIED
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED>
- <!ELEMENT subblock (collection)*>
- <!ATTLIST subblock
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED>
- <!ELEMENT collection (component)*>
- <!ATTLIST collection
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED
- level NMTOKEN #IMPLIED>
- <!ELEMENT component (unit)*>
- <!ATTLIST component
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED
- deprecated CDATA #IMPLIED
- introduced CDATA #IMPLIED
- contract CDATA #IMPLIED
- plugin (Y|N) 'N'
- filter CDATA #IMPLIED
- class NMTOKENS #IMPLIED
- supports CDATA #IMPLIED
- purpose (optional|mandatory|development) 'optional'>
- <!ELEMENT unit EMPTY>
- <!ATTLIST unit
- mrp CDATA #IMPLIED
- filter CDATA #IMPLIED
- bldFile CDATA #IMPLIED
- root CDATA #IMPLIED
- version NMTOKEN #IMPLIED
- prebuilt NMTOKEN #IMPLIED
- late (Y|N) #IMPLIED
- priority CDATA #IMPLIED>
- <!ELEMENT SystemBuild (option*|target+|targetList+|list+|configuration+)*>
- <!ATTLIST SystemBuild schema CDATA #REQUIRED>
- <!ELEMENT list (ref+)>
- <!ATTLIST list
- name ID #REQUIRED
- description CDATA #REQUIRED>
- <!ELEMENT ref EMPTY>
- <!ATTLIST ref item CDATA #REQUIRED>
- <!ELEMENT targetList EMPTY>
- <!ATTLIST targetList
- name ID #REQUIRED
- description CDATA #REQUIRED
- target IDREFS #REQUIRED>
- <!ELEMENT target EMPTY>
- <!ATTLIST target
- name ID #REQUIRED
- abldTarget CDATA #REQUIRED
- description CDATA #REQUIRED>
- <!ELEMENT option EMPTY>
- <!ATTLIST option
- name ID #REQUIRED
- abldOption CDATA #REQUIRED
- description CDATA #REQUIRED
- enable (Y|N) #REQUIRED>
- <!ELEMENT configuration (listRef+|ref+|task+)*>
- <!ATTLIST configuration
- name ID #REQUIRED
- description CDATA #REQUIRED
- filter CDATA #REQUIRED>
- <!ELEMENT task (listRef*,(buildLayer|specialInstructions))>
- <!ELEMENT listRef EMPTY>
- <!ATTLIST listRef list CDATA #REQUIRED>
- <!ELEMENT buildLayer EMPTY>
- <!ATTLIST buildLayer
- command CDATA #REQUIRED
- targetList IDREFS #IMPLIED
- unitParallel (Y|N) #REQUIRED
- targetParallel (Y|N) 'N'>
- <!ELEMENT specialInstructions EMPTY>
- <!ATTLIST specialInstructions
- name CDATA #REQUIRED
- cwd CDATA #REQUIRED
- root CDATA #IMPLIED
- command CDATA #REQUIRED>
-]>
-<SystemDefinition schema="2.0.1" name="Symbian^3">
-<systemModel>
-<layer name="os" long-name="OS" levels="hw services">
-<block name="persistentdata" level="services" long-name="Persistent Data Services" levels="adaptation hw-if plugin framework server app-if">
-<collection name="featuremgmt" long-name="Feature Management" level="framework">
-<component name="featuremgr" long-name="Feature Manager" introduced="tb92" purpose="mandatory">
-<unit bldFile="/sf/os/persistentdata/featuremgmt/featuremgr/group" mrp="/sf/os/persistentdata/featuremgmt/featuremgr/group/syslibs_featmgr.mrp"/>
-</component>
-<component name="featureregistry" long-name="Feature Registry" introduced="9.2" deprecated="tb92" purpose="mandatory">
-<unit bldFile="/sf/os/persistentdata/featuremgmt/featureregistry/group" mrp="/sf/os/persistentdata/featuremgmt/featureregistry/group/syslibs_featreg.mrp"/>
-</component>
-</collection>
-<collection name="loggingservices" long-name="Logging Services" level="server">
-<component name="eventlogger" long-name="Event Logger" introduced="6.0" purpose="optional">
-<unit bldFile="/sf/os/persistentdata/loggingservices/eventlogger/group" mrp="/sf/os/persistentdata/loggingservices/eventlogger/group/syslibs_logeng.mrp"/>
-</component>
-<component name="filelogger" long-name="File Logger" introduced="ER5" purpose="optional">
-<unit bldFile="/sf/os/persistentdata/loggingservices/filelogger/group" mrp="/sf/os/persistentdata/loggingservices/filelogger/group/comms-infras_flogger.mrp"/>
-</component>
-<component name="rfilelogger" long-name="RFile Logger" deprecated="tb92" introduced="9.1" purpose="development">
-<unit bldFile="/sf/os/persistentdata/loggingservices/rfilelogger/group" mrp="/sf/os/persistentdata/loggingservices/rfilelogger/group/testtools_utilities.mrp"/>
-</component>
-</collection>
-<collection name="traceservices" long-name="Trace Services" level="server">
-<component name="commsdebugutility" long-name="Comms Debug Utility" introduced="7.0s" purpose="optional">
-<unit bldFile="/sf/os/persistentdata/traceservices/commsdebugutility/group" mrp="/sf/os/persistentdata/traceservices/commsdebugutility/group/comms-infras_commsdebugutility.mrp"/>
-</component>
-<component name="tracefw" long-name="Trace Framework" introduced="9.2" purpose="development">
-<unit bldFile="/sf/os/persistentdata/traceservices/tracefw/ulogger/group" mrp="/sf/os/persistentdata/traceservices/tracefw/ulogger/group/tools_debug_trace.mrp"/>
-</component>
-</collection>
-<collection name="persistentstorage" long-name="Persistent Storage" level="framework">
-<component name="store" long-name="Store" purpose="optional">
-<unit bldFile="/sf/os/persistentdata/persistentstorage/store/group" mrp="/sf/os/persistentdata/persistentstorage/store/group/syslibs_store.mrp"/>
-</component>
-<component name="dbms" long-name="DBMS" purpose="optional">
-<unit bldFile="/sf/os/persistentdata/persistentstorage/dbms/group" mrp="/sf/os/persistentdata/persistentstorage/dbms/group/syslibs_dbms.mrp"/>
-</component>
-<component name="centralrepository" long-name="Central Repository" introduced="7.0s" purpose="mandatory">
-<unit bldFile="/sf/os/persistentdata/persistentstorage/centralrepository/group" mrp="/sf/os/persistentdata/persistentstorage/centralrepository/group/syslibs_centralrepository.mrp"/>
-</component>
-<component name="sql" long-name="SQL" introduced="9.3" purpose="optional">
-<unit bldFile="/sf/os/persistentdata/persistentstorage/sql/GROUP" mrp="/sf/os/persistentdata/persistentstorage/sql/GROUP/syslibs_sql.mrp"/>
-</component>
-<component name="sqlite3api" long-name="SQLite 3 API" introduced="tb92" purpose="optional">
-<unit bldFile="/sf/os/persistentdata/persistentstorage/sqlite3api/GROUP" mrp="/sf/os/persistentdata/persistentstorage/sqlite3api/GROUP/syslibs_sqlite3.mrp"/>
-</component>
-</collection>
-<collection name="persistentdata_info" long-name="Persistent Data Services Info" level="app-if">
-<component name="persistentdata_metadata" long-name="Persistent Data Services Metadata" introduced="tb91" purpose="development" class="config PC">
-<unit mrp="/sf/os/persistentdata/persistentdata_info/persistentdata_metadata/persistentdata_metadata.mrp"/>
-</component>
-</collection>
-</block>
-</layer>
-</systemModel>
-</SystemDefinition>
\ No newline at end of file
+<!DOCTYPE SystemDefinition [
+<!ELEMENT SystemDefinition ( systemModel )>
+<!ATTLIST SystemDefinition
+ name CDATA #REQUIRED
+ schema CDATA #REQUIRED
+>
+<!-- all paths are relative to the environment variable specified by the root attribute, or SOURCEROOT if not. -->
+
+<!-- System Model Section of DTD -->
+<!ELEMENT systemModel (layer+)>
+
+<!ELEMENT layer (block* | collection*)*>
+<!-- Kernel Services, Base Services, OS Services, Etc -->
+<!ATTLIST layer
+ name CDATA #REQUIRED
+ long-name CDATA #IMPLIED
+ levels NMTOKENS #IMPLIED
+ span CDATA #IMPLIED
+>
+
+<!ELEMENT block (subblock* | collection*)*>
+ <!-- Generic OS services, Comms Services, etc -->
+<!ATTLIST block
+ levels NMTOKENS #IMPLIED
+ span CDATA #IMPLIED
+ level NMTOKEN #IMPLIED
+ name CDATA #REQUIRED
+ long-name CDATA #IMPLIED
+>
+
+<!ELEMENT subblock (collection)*>
+<!-- Cellular Baseband Services, Networking Services, etc -->
+<!ATTLIST subblock
+ name CDATA #REQUIRED
+ long-name CDATA #IMPLIED
+>
+
+<!ELEMENT collection (component)*>
+<!-- Screen Driver, Content Handling, etc -->
+<!ATTLIST collection
+ name CDATA #REQUIRED
+ long-name CDATA #IMPLIED
+ level NMTOKEN #IMPLIED
+>
+
+<!ELEMENT component (unit)*>
+<!-- contains units or is a package or prebuilt -->
+<!ATTLIST component
+ name CDATA #REQUIRED
+ long-name CDATA #IMPLIED
+ deprecated CDATA #IMPLIED
+ introduced CDATA #IMPLIED
+ contract CDATA #IMPLIED
+ plugin (Y|N) "N"
+ filter CDATA #IMPLIED
+ class NMTOKENS #IMPLIED
+ supports CDATA #IMPLIED
+ purpose ( optional | mandatory | development ) "optional"
+>
+
+<!ELEMENT unit EMPTY >
+<!-- must be buildable (bld.inf) -->
+<!-- bldFile may someday be removed in favour of mrp -->
+<!ATTLIST unit
+ mrp CDATA #IMPLIED
+ filter CDATA #IMPLIED
+ bldFile CDATA #IMPLIED
+ root CDATA #IMPLIED
+ version NMTOKEN #IMPLIED
+ prebuilt NMTOKEN #IMPLIED
+ late (Y|N) #IMPLIED
+ priority CDATA #IMPLIED
+>
+]>
+<SystemDefinition name="Symbian^3" schema="2.0.1">
+ <systemModel>
+ <layer name="os" long-name="OS" levels="hw services">
+ <block name="persistentdata" level="services" long-name="Persistent Data Services" levels="adaptation hw-if plugin framework server app-if">
+ <collection name="featuremgmt" long-name="Feature Management" level="framework">
+ <component name="featuremgr" long-name="Feature Manager" introduced="^3" purpose="mandatory">
+ <unit bldFile="/sf/os/persistentdata/featuremgmt/featuremgr/group" mrp="/sf/os/persistentdata/featuremgmt/featuremgr/group/syslibs_featmgr.mrp"/>
+ </component>
+ <component name="featureregistry" long-name="Feature Registry" introduced="9.2" deprecated="^3" purpose="mandatory">
+ <unit bldFile="/sf/os/persistentdata/featuremgmt/featureregistry/group" mrp="/sf/os/persistentdata/featuremgmt/featureregistry/group/syslibs_featreg.mrp"/>
+ </component>
+ </collection>
+ <collection name="loggingservices" long-name="Logging Services" level="server">
+ <component name="eventlogger" long-name="Event Logger" introduced="6.0" purpose="optional">
+ <unit bldFile="/sf/os/persistentdata/loggingservices/eventlogger/group" mrp="/sf/os/persistentdata/loggingservices/eventlogger/group/syslibs_logeng.mrp"/>
+ </component>
+ <component name="filelogger" long-name="File Logger" introduced="ER5" purpose="optional">
+ <unit bldFile="/sf/os/persistentdata/loggingservices/filelogger/group" mrp="/sf/os/persistentdata/loggingservices/filelogger/group/comms-infras_flogger.mrp"/>
+ </component>
+ <component name="rfilelogger" long-name="RFile Logger" deprecated="^3" introduced="9.1" purpose="development">
+ <unit bldFile="/sf/os/persistentdata/loggingservices/rfilelogger/group" mrp="/sf/os/persistentdata/loggingservices/rfilelogger/group/testtools_utilities.mrp"/>
+ </component>
+ </collection>
+ <collection name="traceservices" long-name="Trace Services" level="server">
+ <component name="commsdebugutility" long-name="Comms Debug Utility" introduced="7.0s" purpose="optional">
+ <unit bldFile="/sf/os/persistentdata/traceservices/commsdebugutility/group" mrp="/sf/os/persistentdata/traceservices/commsdebugutility/group/comms-infras_commsdebugutility.mrp"/>
+ </component>
+ <component name="tracefw" long-name="Trace Framework" introduced="9.2" purpose="development">
+ <unit bldFile="/sf/os/persistentdata/traceservices/tracefw/ulogger/group" mrp="/sf/os/persistentdata/traceservices/tracefw/ulogger/group/tools_debug_trace.mrp"/>
+ </component>
+ </collection>
+ <collection name="persistentstorage" long-name="Persistent Storage" level="framework">
+ <component name="store" long-name="Store" purpose="optional">
+ <unit bldFile="/sf/os/persistentdata/persistentstorage/store/group" mrp="/sf/os/persistentdata/persistentstorage/store/group/syslibs_store.mrp"/>
+ </component>
+ <component name="dbms" long-name="DBMS" purpose="optional">
+ <unit bldFile="/sf/os/persistentdata/persistentstorage/dbms/group" mrp="/sf/os/persistentdata/persistentstorage/dbms/group/syslibs_dbms.mrp"/>
+ </component>
+ <component name="centralrepository" long-name="Central Repository" introduced="7.0s" purpose="mandatory">
+ <unit bldFile="/sf/os/persistentdata/persistentstorage/centralrepository/group" mrp="/sf/os/persistentdata/persistentstorage/centralrepository/group/syslibs_centralrepository.mrp"/>
+ </component>
+ <component name="sql" long-name="SQL" introduced="9.3" purpose="optional">
+ <unit bldFile="/sf/os/persistentdata/persistentstorage/sql/GROUP" mrp="/sf/os/persistentdata/persistentstorage/sql/GROUP/syslibs_sql.mrp"/>
+ </component>
+ <component name="sqlite3api" long-name="SQLite 3 API" introduced="^3" purpose="optional">
+ <unit bldFile="/sf/os/persistentdata/persistentstorage/sqlite3api/GROUP" mrp="/sf/os/persistentdata/persistentstorage/sqlite3api/GROUP/syslibs_sqlite3.mrp"/>
+ </component>
+ </collection>
+ <collection name="persistentdata_info" long-name="Persistent Data Services Info" level="app-if">
+ <component name="persistentdata_metadata" long-name="Persistent Data Services Metadata" introduced="^2" purpose="development" class="config PC">
+ <unit mrp="/sf/os/persistentdata/persistentdata_info/persistentdata_metadata/persistentdata_metadata.mrp"/>
+ </component>
+ </collection>
+ </block>
+ </layer>
+ </systemModel>
+</SystemDefinition>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/symbian3/os/persistentdata/package_definition_3.0.xml Mon Feb 15 18:25:55 2010 +0000
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<SystemDefinition schema="3.0.0">
+ <package id="persistentdata" name="Persistent Data Services" levels="adaptation hw-if plugin framework server app-if">
+ <collection id="featuremgmt" name="Feature Management" level="framework">
+ <component id="featuremgr" name="Feature Manager" introduced="^3" purpose="mandatory">
+ <unit bldFile="featuremgmt/featuremgr/group" mrp="featuremgmt/featuremgr/group/syslibs_featmgr.mrp"/>
+ </component>
+ <component id="featureregistry" name="Feature Registry" introduced="9.2" deprecated="^3" purpose="mandatory">
+ <unit bldFile="featuremgmt/featureregistry/group" mrp="featuremgmt/featureregistry/group/syslibs_featreg.mrp"/>
+ </component>
+ </collection>
+ <collection id="loggingservices" name="Logging Services" level="server">
+ <component id="eventlogger" name="Event Logger" introduced="6.0" purpose="optional">
+ <unit bldFile="loggingservices/eventlogger/group" mrp="loggingservices/eventlogger/group/syslibs_logeng.mrp"/>
+ </component>
+ <component id="filelogger" name="File Logger" introduced="ER5" purpose="optional">
+ <unit bldFile="loggingservices/filelogger/group" mrp="loggingservices/filelogger/group/comms-infras_flogger.mrp"/>
+ </component>
+ <component id="rfilelogger" name="RFile Logger" deprecated="^3" introduced="9.1" purpose="development">
+ <unit bldFile="loggingservices/rfilelogger/group" mrp="loggingservices/rfilelogger/group/testtools_utilities.mrp"/>
+ </component>
+ </collection>
+ <collection id="traceservices" name="Trace Services" level="server">
+ <component id="commsdebugutility" name="Comms Debug Utility" introduced="7.0s" purpose="optional">
+ <unit bldFile="traceservices/commsdebugutility/group" mrp="traceservices/commsdebugutility/group/comms-infras_commsdebugutility.mrp"/>
+ </component>
+ <component id="tracefw" name="Trace Framework" introduced="9.2" purpose="development">
+ <unit bldFile="traceservices/tracefw/ulogger/group" mrp="traceservices/tracefw/ulogger/group/tools_debug_trace.mrp"/>
+ </component>
+ </collection>
+ <collection id="persistentstorage" name="Persistent Storage" level="framework">
+ <component id="store" name="Store" purpose="optional">
+ <unit bldFile="persistentstorage/store/group" mrp="persistentstorage/store/group/syslibs_store.mrp"/>
+ </component>
+ <component id="dbms" name="DBMS" purpose="optional">
+ <unit bldFile="persistentstorage/dbms/group" mrp="persistentstorage/dbms/group/syslibs_dbms.mrp"/>
+ </component>
+ <component id="centralrepository" name="Central Repository" introduced="7.0s" purpose="mandatory">
+ <unit bldFile="persistentstorage/centralrepository/group" mrp="persistentstorage/centralrepository/group/syslibs_centralrepository.mrp"/>
+ </component>
+ <component id="sql" name="SQL" introduced="9.3" purpose="optional">
+ <unit bldFile="persistentstorage/sql/GROUP" mrp="persistentstorage/sql/GROUP/syslibs_sql.mrp"/>
+ </component>
+ <component id="sqlite3api" name="SQLite 3 API" introduced="^3" purpose="optional">
+ <unit bldFile="persistentstorage/sqlite3api/GROUP" mrp="persistentstorage/sqlite3api/GROUP/syslibs_sqlite3.mrp"/>
+ </component>
+ </collection>
+ <collection id="persistentdata_info" name="Persistent Data Services Info" level="app-if">
+ <component id="persistentdata_metadata" name="Persistent Data Services Metadata" class="config" introduced="^2" purpose="development" target="desktop">
+ <unit mrp="persistentdata_info/persistentdata_metadata/persistentdata_metadata.mrp"/>
+ </component>
+ </collection>
+ </package>
+</SystemDefinition>
--- a/symbian3/os/security/package_definition.xml Fri Feb 12 16:37:22 2010 +0000
+++ b/symbian3/os/security/package_definition.xml Mon Feb 15 18:25:55 2010 +0000
@@ -1,179 +1,165 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE SystemDefinition [
- <!ELEMENT SystemDefinition (systemModel?,SystemBuild?)>
- <!ATTLIST SystemDefinition
- name CDATA #REQUIRED
- schema CDATA #REQUIRED>
- <!ELEMENT systemModel (layer+)>
- <!ELEMENT layer (block*|collection*)*>
- <!ATTLIST layer
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED
- levels NMTOKENS #IMPLIED
- span CDATA #IMPLIED>
- <!ELEMENT block (subblock*|collection*)*>
- <!ATTLIST block
- levels NMTOKENS #IMPLIED
- span CDATA #IMPLIED
- level NMTOKEN #IMPLIED
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED>
- <!ELEMENT subblock (collection)*>
- <!ATTLIST subblock
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED>
- <!ELEMENT collection (component)*>
- <!ATTLIST collection
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED
- level NMTOKEN #IMPLIED>
- <!ELEMENT component (unit)*>
- <!ATTLIST component
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED
- deprecated CDATA #IMPLIED
- introduced CDATA #IMPLIED
- contract CDATA #IMPLIED
- plugin (Y|N) 'N'
- filter CDATA #IMPLIED
- class NMTOKENS #IMPLIED
- supports CDATA #IMPLIED
- purpose (optional|mandatory|development) 'optional'>
- <!ELEMENT unit EMPTY>
- <!ATTLIST unit
- mrp CDATA #IMPLIED
- filter CDATA #IMPLIED
- bldFile CDATA #IMPLIED
- root CDATA #IMPLIED
- version NMTOKEN #IMPLIED
- prebuilt NMTOKEN #IMPLIED
- late (Y|N) #IMPLIED
- priority CDATA #IMPLIED>
- <!ELEMENT SystemBuild (option*|target+|targetList+|list+|configuration+)*>
- <!ATTLIST SystemBuild schema CDATA #REQUIRED>
- <!ELEMENT list (ref+)>
- <!ATTLIST list
- name ID #REQUIRED
- description CDATA #REQUIRED>
- <!ELEMENT ref EMPTY>
- <!ATTLIST ref item CDATA #REQUIRED>
- <!ELEMENT targetList EMPTY>
- <!ATTLIST targetList
- name ID #REQUIRED
- description CDATA #REQUIRED
- target IDREFS #REQUIRED>
- <!ELEMENT target EMPTY>
- <!ATTLIST target
- name ID #REQUIRED
- abldTarget CDATA #REQUIRED
- description CDATA #REQUIRED>
- <!ELEMENT option EMPTY>
- <!ATTLIST option
- name ID #REQUIRED
- abldOption CDATA #REQUIRED
- description CDATA #REQUIRED
- enable (Y|N) #REQUIRED>
- <!ELEMENT configuration (listRef+|ref+|task+)*>
- <!ATTLIST configuration
- name ID #REQUIRED
- description CDATA #REQUIRED
- filter CDATA #REQUIRED>
- <!ELEMENT task (listRef*,(buildLayer|specialInstructions))>
- <!ELEMENT listRef EMPTY>
- <!ATTLIST listRef list CDATA #REQUIRED>
- <!ELEMENT buildLayer EMPTY>
- <!ATTLIST buildLayer
- command CDATA #REQUIRED
- targetList IDREFS #IMPLIED
- unitParallel (Y|N) #REQUIRED
- targetParallel (Y|N) 'N'>
- <!ELEMENT specialInstructions EMPTY>
- <!ATTLIST specialInstructions
- name CDATA #REQUIRED
- cwd CDATA #REQUIRED
- root CDATA #IMPLIED
- command CDATA #REQUIRED>
-]>
-<SystemDefinition schema="2.0.1" name="Symbian^3">
-<systemModel>
-<layer name="os" long-name="OS" levels="hw services">
-<block name="security" level="services" long-name="OS Security" levels="physical-abstraction plugins libraries management services utilities">
-<collection name="authorisation" long-name="Authorisation" level="utilities">
-<component name="userpromptservice" long-name="User Prompt Service" introduced="tb92" purpose="mandatory">
-<unit bldFile="/sf/os/security/authorisation/userpromptservice/group" mrp="/sf/os/security/authorisation/userpromptservice/group/security_ups.mrp"/>
-</component>
-<component name="userpromptutils" long-name="User Prompt Utils" introduced="tb92" purpose="optional">
-<unit bldFile="/sf/os/security/authorisation/userpromptutils/group" mrp="/sf/os/security/authorisation/userpromptutils/group/security_ups_utils.mrp"/>
-</component>
-</collection>
-<collection name="contentmgmt" long-name="Content Management" level="utilities">
-<component name="contentaccessfwfordrm" long-name="Content Access Framework for DRM" introduced="9.1" purpose="mandatory">
-<unit bldFile="/sf/os/security/contentmgmt/contentaccessfwfordrm/group" mrp="/sf/os/security/contentmgmt/contentaccessfwfordrm/group/security_caf2.mrp"/>
-</component>
-<component name="cafrecogniserconfig" long-name="CAF Recogniser Config" introduced="9.1" purpose="mandatory">
-<unit bldFile="/sf/os/security/contentmgmt/cafrecogniserconfig" mrp="/sf/os/security/contentmgmt/cafrecogniserconfig/security_reccafconfig.mrp"/>
-</component>
-<component name="referencedrmagent" long-name="Reference DRM Agent" introduced="8.0" purpose="development">
-<unit bldFile="/sf/os/security/contentmgmt/referencedrmagent/RefTestAgent/group" mrp="/sf/os/security/contentmgmt/referencedrmagent/RefTestAgent/group/security_rta.mrp"/>
-</component>
-</collection>
-<collection name="crypto" long-name="Crypto Libraries" level="libraries">
-<component name="weakcryptospi" long-name="Weak Crypto SPI" filter="gt" introduced="tb92" purpose="optional">
-<unit bldFile="/sf/os/security/crypto/weakcryptospi/group" mrp="/sf/os/security/crypto/weakcryptospi/group/security_cryptospi_weak.mrp"/>
-</component>
-<component name="strongcryptospi" long-name="Strong Crypto SPI" filter="gt" introduced="tb92" purpose="optional">
-<unit bldFile="/sf/os/security/crypto/weakcryptospi/strong" mrp="/sf/os/security/crypto/weakcryptospi/group/security_cryptospi_strong.mrp"/>
-</component>
-</collection>
-<collection name="cryptomgmtlibs" long-name="Crypto Management Libraries" level="management">
-<component name="securityutils" long-name="Security Utils" introduced="8.0" purpose="optional">
-<unit bldFile="/sf/os/security/cryptomgmtlibs/securityutils/group" mrp="/sf/os/security/cryptomgmtlibs/securityutils/group/security_common.mrp"/>
-</component>
-<component name="securitytestfw" long-name="Security Test Framework" deprecated="tb92" introduced="7.0" purpose="development">
-<unit mrp="/sf/os/security/cryptomgmtlibs/securitytestfw/group/security_testframework.mrp"/>
-</component>
-<component name="securitydocs" long-name="Security Documentation" purpose="development" class="doc">
-<unit mrp="/sf/os/security/cryptomgmtlibs/securitydocs/security_documentation.mrp"/>
-</component>
-<component name="cryptotokenfw" long-name="Crypto Token Framework" introduced="7.0" purpose="optional">
-<unit bldFile="/sf/os/security/cryptomgmtlibs/cryptotokenfw/group" mrp="/sf/os/security/cryptomgmtlibs/cryptotokenfw/group/security_cryptotokens.mrp"/>
-</component>
-<component name="securitycommonutils" long-name="Security Common Utils" introduced="8.0" purpose="mandatory">
-<unit bldFile="/sf/os/security/cryptomgmtlibs/securitycommonutils/group" mrp="/sf/os/security/cryptomgmtlibs/securitycommonutils/group/security_commonutils.mrp"/>
-</component>
-</collection>
-<collection name="securityanddataprivacytools" long-name="Security and Data Privacy Tools" level="services">
-<component name="securityconfig" long-name="Security Config" introduced="9.1" purpose="optional">
-<unit bldFile="/sf/os/security/securityanddataprivacytools/securityconfig/group" mrp="/sf/os/security/securityanddataprivacytools/securityconfig/group/security_config.mrp"/>
-</component>
-<component name="securitytools" long-name="Security Tools" introduced="tb92" purpose="optional" class="PC">
-<unit bldFile="/sf/os/security/securityanddataprivacytools/securitytools/group" mrp="/sf/os/security/securityanddataprivacytools/securitytools/group/security_tools.mrp"/>
-</component>
-</collection>
-<collection name="cryptoplugins" long-name="Crypto Plugins" level="plugins">
-<component name="cryptospiplugins" long-name="Crypto SPI Plugins" filter="gt" introduced="tb92" purpose="optional" plugin="Y">
-<unit bldFile="/sf/os/security/cryptoplugins/cryptospiplugins/group" mrp="/sf/os/security/cryptoplugins/cryptospiplugins/group/security_cryptospi_plugins.mrp"/>
-</component>
-</collection>
-<collection name="cryptoservices" long-name="Crypto Services" level="plugins">
-<component name="certificateandkeymgmt" long-name="Certificate and Key Management" introduced="6.0" purpose="optional">
-<unit bldFile="/sf/os/security/cryptoservices/certificateandkeymgmt/group" mrp="/sf/os/security/cryptoservices/certificateandkeymgmt/group/security_certman.mrp"/>
-</component>
-<component name="filebasedcertificateandkeystores" long-name="File-based Certificate and Key Stores" introduced="8.0" purpose="optional">
-<unit bldFile="/sf/os/security/cryptoservices/filebasedcertificateandkeystores/group" mrp="/sf/os/security/cryptoservices/filebasedcertificateandkeystores/group/security_filetokens.mrp"/>
-</component>
-<component name="asnpkcs" long-name="ASN PKCS" introduced="8.0" purpose="optional">
-<unit bldFile="/sf/os/security/cryptoservices/asnpkcs/group" mrp="/sf/os/security/cryptoservices/asnpkcs/group/security_asnpkcs.mrp"/>
-</component>
-</collection>
-<collection name="authenticationservices" long-name="Authentication Services" level="utilities">
-</collection>
-<collection name="security_info" long-name="OS Security Info" level="utilities">
-<component name="security_metadata" long-name="OS Security Metadata" introduced="tb91" purpose="development" class="config PC">
-<unit mrp="/sf/os/security/security_info/security_metadata/security_metadata.mrp"/>
-</component>
-</collection>
-</block>
-</layer>
-</systemModel>
-</SystemDefinition>
\ No newline at end of file
+<!DOCTYPE SystemDefinition [
+<!ELEMENT SystemDefinition ( systemModel )>
+<!ATTLIST SystemDefinition
+ name CDATA #REQUIRED
+ schema CDATA #REQUIRED
+>
+<!-- all paths are relative to the environment variable specified by the root attribute, or SOURCEROOT if not. -->
+
+<!-- System Model Section of DTD -->
+<!ELEMENT systemModel (layer+)>
+
+<!ELEMENT layer (block* | collection*)*>
+<!-- Kernel Services, Base Services, OS Services, Etc -->
+<!ATTLIST layer
+ name CDATA #REQUIRED
+ long-name CDATA #IMPLIED
+ levels NMTOKENS #IMPLIED
+ span CDATA #IMPLIED
+>
+
+<!ELEMENT block (subblock* | collection*)*>
+ <!-- Generic OS services, Comms Services, etc -->
+<!ATTLIST block
+ levels NMTOKENS #IMPLIED
+ span CDATA #IMPLIED
+ level NMTOKEN #IMPLIED
+ name CDATA #REQUIRED
+ long-name CDATA #IMPLIED
+>
+
+<!ELEMENT subblock (collection)*>
+<!-- Cellular Baseband Services, Networking Services, etc -->
+<!ATTLIST subblock
+ name CDATA #REQUIRED
+ long-name CDATA #IMPLIED
+>
+
+<!ELEMENT collection (component)*>
+<!-- Screen Driver, Content Handling, etc -->
+<!ATTLIST collection
+ name CDATA #REQUIRED
+ long-name CDATA #IMPLIED
+ level NMTOKEN #IMPLIED
+>
+
+<!ELEMENT component (unit)*>
+<!-- contains units or is a package or prebuilt -->
+<!ATTLIST component
+ name CDATA #REQUIRED
+ long-name CDATA #IMPLIED
+ deprecated CDATA #IMPLIED
+ introduced CDATA #IMPLIED
+ contract CDATA #IMPLIED
+ plugin (Y|N) "N"
+ filter CDATA #IMPLIED
+ class NMTOKENS #IMPLIED
+ supports CDATA #IMPLIED
+ purpose ( optional | mandatory | development ) "optional"
+>
+
+<!ELEMENT unit EMPTY >
+<!-- must be buildable (bld.inf) -->
+<!-- bldFile may someday be removed in favour of mrp -->
+<!ATTLIST unit
+ mrp CDATA #IMPLIED
+ filter CDATA #IMPLIED
+ bldFile CDATA #IMPLIED
+ root CDATA #IMPLIED
+ version NMTOKEN #IMPLIED
+ prebuilt NMTOKEN #IMPLIED
+ late (Y|N) #IMPLIED
+ priority CDATA #IMPLIED
+>
+]>
+<SystemDefinition name="Symbian^3" schema="2.0.1">
+ <systemModel>
+ <layer name="os" long-name="OS" levels="hw services">
+ <block name="security" level="services" long-name="OS Security" levels="physical-abstraction plugins libraries management services utilities">
+ <collection name="authenticationservices" long-name="Authentication Services" level="utilities">
+ <component name="authenticationserver" long-name="Authentication Server" introduced="^3" purpose="optional">
+ <unit bldFile="/sf/os/security/authenticationservices/authenticationserver/group" mrp="/sf/os/security/authenticationservices/authenticationserver/group/security_authserver.mrp"/>
+ </component>
+ </collection>
+ <collection name="authorisation" long-name="Authorisation" level="utilities">
+ <component name="userpromptservice" long-name="User Prompt Service" introduced="^3" purpose="mandatory">
+ <unit bldFile="/sf/os/security/authorisation/userpromptservice/group" mrp="/sf/os/security/authorisation/userpromptservice/group/security_ups.mrp"/>
+ </component>
+ <component name="userpromptutils" long-name="User Prompt Utils" introduced="^3" purpose="optional">
+ <unit bldFile="/sf/os/security/authorisation/userpromptutils/group" mrp="/sf/os/security/authorisation/userpromptutils/group/security_ups_utils.mrp"/>
+ </component>
+ </collection>
+ <collection name="contentmgmt" long-name="Content Management" level="utilities">
+ <component name="contentaccessfwfordrm" long-name="Content Access Framework for DRM" introduced="9.1" purpose="mandatory">
+ <unit bldFile="/sf/os/security/contentmgmt/contentaccessfwfordrm/group" mrp="/sf/os/security/contentmgmt/contentaccessfwfordrm/group/security_caf2.mrp"/>
+ </component>
+ <component name="cafrecogniserconfig" long-name="CAF Recogniser Config" introduced="9.1" purpose="mandatory">
+ <unit bldFile="/sf/os/security/contentmgmt/cafrecogniserconfig" mrp="/sf/os/security/contentmgmt/cafrecogniserconfig/security_reccafconfig.mrp"/>
+ </component>
+ <component name="referencedrmagent" long-name="Reference DRM Agent" introduced="8.0" purpose="development">
+ <unit bldFile="/sf/os/security/contentmgmt/referencedrmagent/RefTestAgent/group" mrp="/sf/os/security/contentmgmt/referencedrmagent/RefTestAgent/group/security_rta.mrp"/>
+ </component>
+ </collection>
+ <collection name="crypto" long-name="Crypto Libraries" level="libraries">
+ <component name="weakcryptospi" long-name="Weak Crypto SPI" filter="gt" introduced="^3" purpose="optional">
+ <unit bldFile="/sf/os/security/crypto/weakcryptospi/group" mrp="/sf/os/security/crypto/weakcryptospi/group/security_cryptospi_weak.mrp"/>
+ </component>
+ <component name="strongcryptospi" long-name="Strong Crypto SPI" filter="gt" introduced="^3" purpose="optional">
+ <unit bldFile="/sf/os/security/crypto/weakcryptospi/strong" mrp="/sf/os/security/crypto/weakcryptospi/group/security_cryptospi_strong.mrp"/>
+ </component>
+ </collection>
+ <collection name="cryptomgmtlibs" long-name="Crypto Management Libraries" level="management">
+ <component name="securityutils" long-name="Security Utils" introduced="8.0" purpose="optional">
+ <unit bldFile="/sf/os/security/cryptomgmtlibs/securityutils/group" mrp="/sf/os/security/cryptomgmtlibs/securityutils/group/security_common.mrp"/>
+ </component>
+ <component name="securitytestfw" long-name="Security Test Framework" deprecated="^3" introduced="7.0" purpose="development" filter="test">
+ <unit mrp="/sf/os/security/cryptomgmtlibs/securitytestfw/group/security_testframework.mrp" bldFile="/sf/os/security/cryptomgmtlibs/securitytestfw/group"/>
+ </component>
+ <component name="securitydocs" long-name="Security Documentation" purpose="development" class="doc">
+ <unit mrp="/sf/os/security/cryptomgmtlibs/securitydocs/security_documentation.mrp"/>
+ </component>
+ <component name="cryptotokenfw" long-name="Crypto Token Framework" introduced="7.0" purpose="optional">
+ <unit bldFile="/sf/os/security/cryptomgmtlibs/cryptotokenfw/group" mrp="/sf/os/security/cryptomgmtlibs/cryptotokenfw/group/security_cryptotokens.mrp"/>
+ </component>
+ <component name="securitycommonutils" long-name="Security Common Utils" introduced="8.0" purpose="mandatory">
+ <unit bldFile="/sf/os/security/cryptomgmtlibs/securitycommonutils/group" mrp="/sf/os/security/cryptomgmtlibs/securitycommonutils/group/security_commonutils.mrp"/>
+ </component>
+ </collection>
+ <collection name="securityanddataprivacytools" long-name="Security and Data Privacy Tools" level="services">
+ <component name="securityconfig" long-name="Security Config" introduced="9.1" purpose="optional">
+ <unit bldFile="/sf/os/security/securityanddataprivacytools/securityconfig/group" mrp="/sf/os/security/securityanddataprivacytools/securityconfig/group/security_config.mrp"/>
+ </component>
+ <component name="securitytools" long-name="Security Tools" introduced="^3" purpose="optional" class="PC">
+ <unit bldFile="/sf/os/security/securityanddataprivacytools/securitytools/group" mrp="/sf/os/security/securityanddataprivacytools/securitytools/group/security_tools.mrp"/>
+ </component>
+ </collection>
+ <collection name="cryptoplugins" long-name="Crypto Plugins" level="plugins">
+ <component name="cryptospiplugins" long-name="Crypto SPI Plugins" filter="gt" introduced="^3" purpose="optional" plugin="Y">
+ <unit bldFile="/sf/os/security/cryptoplugins/cryptospiplugins/group" mrp="/sf/os/security/cryptoplugins/cryptospiplugins/group/security_cryptospi_plugins.mrp"/>
+ </component>
+ </collection>
+ <collection name="cryptoservices" long-name="Crypto Services" level="plugins">
+ <component name="certificateandkeymgmt" long-name="Certificate and Key Management" introduced="6.0" purpose="optional">
+ <unit bldFile="/sf/os/security/cryptoservices/certificateandkeymgmt/group" mrp="/sf/os/security/cryptoservices/certificateandkeymgmt/group/security_certman.mrp"/>
+ </component>
+ <component name="filebasedcertificateandkeystores" long-name="File-based Certificate and Key Stores" introduced="8.0" purpose="optional">
+ <unit bldFile="/sf/os/security/cryptoservices/filebasedcertificateandkeystores/group" mrp="/sf/os/security/cryptoservices/filebasedcertificateandkeystores/group/security_filetokens.mrp"/>
+ </component>
+ <component name="Browser Root Certificates" introduced="^2" purpose="optional" filter="s60">
+ <!-- not really s60 -->
+ <unit mrp="/sf/os/security/cryptoservices/browserrootcertificates/browserrootcerts.mrp"/>
+ </component>
+ <component name="asnpkcs" long-name="ASN PKCS" introduced="8.0" purpose="optional">
+ <unit bldFile="/sf/os/security/cryptoservices/asnpkcs/group" mrp="/sf/os/security/cryptoservices/asnpkcs/group/security_asnpkcs.mrp"/>
+ </component>
+ </collection>
+ <collection name="security_info" long-name="OS Security Info" level="utilities">
+ <component name="security_metadata" long-name="OS Security Metadata" introduced="^2" purpose="development" class="config PC">
+ <unit mrp="/sf/os/security/security_info/security_metadata/security_metadata.mrp"/>
+ </component>
+ </collection>
+ </block>
+ </layer>
+ </systemModel>
+</SystemDefinition>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/symbian3/os/security/package_definition_3.0.xml Mon Feb 15 18:25:55 2010 +0000
@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<SystemDefinition schema="3.0.0">
+ <package id="security" name="OS Security" levels="physical-abstraction plugins libraries management services utilities">
+ <collection id="authenticationservices" name="Authentication Services" level="utilities">
+ <component id="authenticationserver" name="Authentication Server" introduced="^3" purpose="optional">
+ <unit bldFile="authenticationservices/authenticationserver/group" mrp="authenticationservices/authenticationserver/group/security_authserver.mrp"/>
+ </component>
+ </collection>
+ <collection id="authorisation" name="Authorisation" level="utilities">
+ <component id="userpromptservice" name="User Prompt Service" introduced="^3" purpose="mandatory">
+ <unit bldFile="authorisation/userpromptservice/group" mrp="authorisation/userpromptservice/group/security_ups.mrp"/>
+ </component>
+ <component id="userpromptutils" name="User Prompt Utils" introduced="^3" purpose="optional">
+ <unit bldFile="authorisation/userpromptutils/group" mrp="authorisation/userpromptutils/group/security_ups_utils.mrp"/>
+ </component>
+ </collection>
+ <collection id="contentmgmt" name="Content Management" level="utilities">
+ <component id="contentaccessfwfordrm" name="Content Access Framework for DRM" introduced="9.1" purpose="mandatory">
+ <unit bldFile="contentmgmt/contentaccessfwfordrm/group" mrp="contentmgmt/contentaccessfwfordrm/group/security_caf2.mrp"/>
+ </component>
+ <component id="cafrecogniserconfig" name="CAF Recogniser Config" introduced="9.1" purpose="mandatory">
+ <unit bldFile="contentmgmt/cafrecogniserconfig" mrp="contentmgmt/cafrecogniserconfig/security_reccafconfig.mrp"/>
+ </component>
+ <component id="referencedrmagent" name="Reference DRM Agent" introduced="8.0" purpose="development">
+ <unit bldFile="contentmgmt/referencedrmagent/RefTestAgent/group" mrp="contentmgmt/referencedrmagent/RefTestAgent/group/security_rta.mrp"/>
+ </component>
+ </collection>
+ <collection id="crypto" name="Crypto Libraries" level="libraries">
+ <component id="weakcryptospi" name="Weak Crypto SPI" filter="gt" introduced="^3" purpose="optional">
+ <unit bldFile="crypto/weakcryptospi/group" mrp="crypto/weakcryptospi/group/security_cryptospi_weak.mrp"/>
+ </component>
+ <component id="strongcryptospi" name="Strong Crypto SPI" filter="gt" introduced="^3" purpose="optional">
+ <unit bldFile="crypto/weakcryptospi/strong" mrp="crypto/weakcryptospi/group/security_cryptospi_strong.mrp"/>
+ </component>
+ </collection>
+ <collection id="cryptomgmtlibs" name="Crypto Management Libraries" level="management">
+ <component id="securityutils" name="Security Utils" introduced="8.0" purpose="optional">
+ <unit bldFile="cryptomgmtlibs/securityutils/group" mrp="cryptomgmtlibs/securityutils/group/security_common.mrp"/>
+ </component>
+ <component id="securitytestfw" name="Security Test Framework" deprecated="^3" introduced="7.0" purpose="development" filter="test">
+ <unit mrp="cryptomgmtlibs/securitytestfw/group/security_testframework.mrp" bldFile="cryptomgmtlibs/securitytestfw/group"/>
+ </component>
+ <component id="securitydocs" name="Security Documentation" purpose="development" class="doc">
+ <unit mrp="cryptomgmtlibs/securitydocs/security_documentation.mrp"/>
+ </component>
+ <component id="cryptotokenfw" name="Crypto Token Framework" introduced="7.0" purpose="optional">
+ <unit bldFile="cryptomgmtlibs/cryptotokenfw/group" mrp="cryptomgmtlibs/cryptotokenfw/group/security_cryptotokens.mrp"/>
+ </component>
+ <component id="securitycommonutils" name="Security Common Utils" introduced="8.0" purpose="mandatory">
+ <unit bldFile="cryptomgmtlibs/securitycommonutils/group" mrp="cryptomgmtlibs/securitycommonutils/group/security_commonutils.mrp"/>
+ </component>
+ </collection>
+ <collection id="securityanddataprivacytools" name="Security and Data Privacy Tools" level="services">
+ <component id="securityconfig" name="Security Config" introduced="9.1" purpose="optional">
+ <unit bldFile="securityanddataprivacytools/securityconfig/group" mrp="securityanddataprivacytools/securityconfig/group/security_config.mrp"/>
+ </component>
+ <component id="securitytools" name="Security Tools" introduced="^3" purpose="optional" target="desktop">
+ <unit bldFile="securityanddataprivacytools/securitytools/group" mrp="securityanddataprivacytools/securitytools/group/security_tools.mrp"/>
+ </component>
+ </collection>
+ <collection id="cryptoplugins" name="Crypto Plugins" level="plugins">
+ <component id="cryptospiplugins" name="Crypto SPI Plugins" filter="gt" introduced="^3" purpose="optional" class="plugin">
+ <unit bldFile="cryptoplugins/cryptospiplugins/group" mrp="cryptoplugins/cryptospiplugins/group/security_cryptospi_plugins.mrp"/>
+ </component>
+ </collection>
+ <collection id="cryptoservices" name="Crypto Services" level="plugins">
+ <component id="certificateandkeymgmt" name="Certificate and Key Management" introduced="6.0" purpose="optional">
+ <unit bldFile="cryptoservices/certificateandkeymgmt/group" mrp="cryptoservices/certificateandkeymgmt/group/security_certman.mrp"/>
+ </component>
+ <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>
+ </collection>
+ <collection id="security_info" name="OS Security Info" level="utilities">
+ <component id="security_metadata" name="OS Security Metadata" class="config" introduced="^2" purpose="development" target="desktop">
+ <unit mrp="security_info/security_metadata/security_metadata.mrp"/>
+ </component>
+ </collection>
+ </package>
+</SystemDefinition>
--- a/symbian3/os/textandloc/package_definition.xml Fri Feb 12 16:37:22 2010 +0000
+++ b/symbian3/os/textandloc/package_definition.xml Mon Feb 15 18:25:55 2010 +0000
@@ -1,177 +1,171 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE SystemDefinition [
- <!ELEMENT SystemDefinition (systemModel?,SystemBuild?)>
- <!ATTLIST SystemDefinition
- name CDATA #REQUIRED
- schema CDATA #REQUIRED>
- <!ELEMENT systemModel (layer+)>
- <!ELEMENT layer (block*|collection*)*>
- <!ATTLIST layer
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED
- levels NMTOKENS #IMPLIED
- span CDATA #IMPLIED>
- <!ELEMENT block (subblock*|collection*)*>
- <!ATTLIST block
- levels NMTOKENS #IMPLIED
- span CDATA #IMPLIED
- level NMTOKEN #IMPLIED
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED>
- <!ELEMENT subblock (collection)*>
- <!ATTLIST subblock
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED>
- <!ELEMENT collection (component)*>
- <!ATTLIST collection
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED
- level NMTOKEN #IMPLIED>
- <!ELEMENT component (unit)*>
- <!ATTLIST component
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED
- deprecated CDATA #IMPLIED
- introduced CDATA #IMPLIED
- contract CDATA #IMPLIED
- plugin (Y|N) 'N'
- filter CDATA #IMPLIED
- class NMTOKENS #IMPLIED
- supports CDATA #IMPLIED
- purpose (optional|mandatory|development) 'optional'>
- <!ELEMENT unit EMPTY>
- <!ATTLIST unit
- mrp CDATA #IMPLIED
- filter CDATA #IMPLIED
- bldFile CDATA #IMPLIED
- root CDATA #IMPLIED
- version NMTOKEN #IMPLIED
- prebuilt NMTOKEN #IMPLIED
- late (Y|N) #IMPLIED
- priority CDATA #IMPLIED>
- <!ELEMENT SystemBuild (option*|target+|targetList+|list+|configuration+)*>
- <!ATTLIST SystemBuild schema CDATA #REQUIRED>
- <!ELEMENT list (ref+)>
- <!ATTLIST list
- name ID #REQUIRED
- description CDATA #REQUIRED>
- <!ELEMENT ref EMPTY>
- <!ATTLIST ref item CDATA #REQUIRED>
- <!ELEMENT targetList EMPTY>
- <!ATTLIST targetList
- name ID #REQUIRED
- description CDATA #REQUIRED
- target IDREFS #REQUIRED>
- <!ELEMENT target EMPTY>
- <!ATTLIST target
- name ID #REQUIRED
- abldTarget CDATA #REQUIRED
- description CDATA #REQUIRED>
- <!ELEMENT option EMPTY>
- <!ATTLIST option
- name ID #REQUIRED
- abldOption CDATA #REQUIRED
- description CDATA #REQUIRED
- enable (Y|N) #REQUIRED>
- <!ELEMENT configuration (listRef+|ref+|task+)*>
- <!ATTLIST configuration
- name ID #REQUIRED
- description CDATA #REQUIRED
- filter CDATA #REQUIRED>
- <!ELEMENT task (listRef*,(buildLayer|specialInstructions))>
- <!ELEMENT listRef EMPTY>
- <!ATTLIST listRef list CDATA #REQUIRED>
- <!ELEMENT buildLayer EMPTY>
- <!ATTLIST buildLayer
- command CDATA #REQUIRED
- targetList IDREFS #IMPLIED
- unitParallel (Y|N) #REQUIRED
- targetParallel (Y|N) 'N'>
- <!ELEMENT specialInstructions EMPTY>
- <!ATTLIST specialInstructions
- name CDATA #REQUIRED
- cwd CDATA #REQUIRED
- root CDATA #IMPLIED
- command CDATA #REQUIRED>
-]>
-<SystemDefinition schema="2.0.1" name="Symbian^3">
-<systemModel>
-<layer name="os" long-name="OS" levels="hw services">
-<block name="textandloc" level="services" long-name="Text and Localisation Services" levels="encoding util fonts tools text">
-<collection name="charconvfw" long-name="Character Conversion" level="encoding">
-<component name="charconv_fw" long-name="Character Encoding and Conversion Framework" purpose="optional">
-<unit bldFile="/sf/os/textandloc/charconvfw/charconv_fw/group" mrp="/sf/os/textandloc/charconvfw/charconv_fw/group/syslibs_charconv.mrp"/>
-</component>
-<component name="charconvplugins" long-name="Character Encoding and Conversion Plugins" purpose="optional" plugin="Y">
-<unit bldFile="/sf/os/textandloc/charconvfw/charconvplugins/group" mrp="/sf/os/textandloc/charconvfw/charconvplugins/group/syslibs_charconv_plugins.mrp"/>
-</component>
-<component name="fatfilenameconversionplugins" long-name="FAT Filename Conversion Plugins" introduced="9.1" purpose="optional" plugin="Y">
-<unit bldFile="/sf/os/kernelhwsrv/userlibandfileserver/fatfilenameconversionplugins/group" mrp="/sf/os/kernelhwsrv/userlibandfileserver/fatfilenameconversionplugins/group/syslibs_FATCharsetConv.mrp"/>
-</component>
-</collection>
-<collection name="fontandtxtsrv" long-name="Font and Text Services" level="fonts">
-<component name="iculayoutengine" long-name="ICU Layout Engine" introduced="9.2" purpose="optional" plugin="Y">
-<unit bldFile="/sf/os/textandloc/fontservices/textshaperplugin/group" mrp="/sf/os/textandloc/fontservices/textshaperplugin/group/graphics_iculayoutengine.mrp"/>
-</component>
-<component name="fontstore" long-name="Font Store" purpose="mandatory">
-<unit bldFile="/sf/os/textandloc/fontservices/fontstore/group" mrp="/sf/os/textandloc/fontservices/fontstore/group/graphics_fntstore.mrp"/>
-</component>
-<component name="textrendering" long-name="Text Rendering" purpose="mandatory" class="placeholder">
-<!-- placeholder for text code from GDI -->
-</component>
-<component name="freetypefontrasteriser" long-name="FreeType Font Rasteriser" purpose="optional" plugin="Y">
-<unit bldFile="/sf/os/textandloc/fontservices/freetypefontrasteriser/group" mrp="/sf/os/textandloc/fontservices/freetypefontrasteriser/group/graphics_freetype.mrp"/>
-</component>
-<component name="referencefonts" long-name="Reference Fonts" introduced="6.0" purpose="optional">
-<unit bldFile="/sf/os/textandloc/fontservices/referencefonts/group" mrp="/sf/os/textandloc/fontservices/referencefonts/group/graphics_fonts.mrp"/>
-</component>
-</collection>
-<collection name="textlayout" long-name="Text Layout" level="text">
-<component name="texthandling" long-name="Text Handling" purpose="optional">
-<unit bldFile="/sf/os/textandloc/textrendering/texthandling/group" mrp="/sf/os/textandloc/textrendering/texthandling/group/app-framework_etext.mrp"/>
-</component>
-<component name="textformatting" long-name="Text Formatting" purpose="optional">
-<unit bldFile="/sf/os/textandloc/textrendering/textformatting/group" mrp="/sf/os/textandloc/textrendering/textformatting/group/app-framework_form.mrp"/>
-</component>
-<component name="word" long-name="Word" purpose="development">
-<unit mrp="/sf/os/textandloc/textrendering/word/group/app-framework_word.mrp"/>
-</component>
-</collection>
-<collection name="textandlocutils" long-name="Text and Localisation Utils" level="util">
-<component name="nearestlangutil" long-name="Nearest Language Util" introduced="tb91" purpose="mandatory" class="placeholder">
-<!-- placeholder for split from bafl -->
-</component>
-<component name="numberformatting" long-name="Number Formatting" introduced="7.0s" purpose="optional">
-<unit bldFile="/sf/os/textandloc/textrendering/numberformatting/group" mrp="/sf/os/textandloc/textrendering/numberformatting/group/app-framework_numberconversion.mrp"/>
-</component>
-</collection>
-<collection name="localesupport" long-name="Locale Support" level="util">
-<component name="reflocales" long-name="Reference Locales" purpose="optional" plugin="Y">
-<unit bldFile="/sf/os/kernelhwsrv/localisation/localesupport" mrp="/sf/os/kernelhwsrv/localisation/localesupport/mmpfiles/base_loce32.mrp"/>
-</component>
-<component name="initlocale" long-name="Initialise Locale" introduced="tb91" purpose="mandatory" class="placeholder">
-<!-- placeholder for split from bafl -->
-</component>
-</collection>
-<collection name="textandloctools" long-name="Text and Localisation Tools" level="tools">
-<component name="fontcompiler" long-name="Font Compiler" purpose="development" class="placeholder PC">
-<!-- placeholder for split from GDI Tools -->
-</component>
-<component name="bitmapfonttools" long-name="Bitmap Font Tools" purpose="development" class="PC">
-<unit bldFile="/sf/os/graphics/graphicstools/bitmapfonttools/group" mrp="/sf/os/graphics/graphicstools/bitmapfonttools/group/graphics_gdtran.mrp"/>
-</component>
-</collection>
-<collection name="textandloc_info" long-name="Text and Localisation Info" level="text">
-<component name="textandloc_metadata" long-name="Text and Localisation Metadata" introduced="tb91" purpose="development" class="config PC">
-<unit mrp="/sf/os/textandloc/textandloc_info/textandloc_metadata/textandloc_metadata.mrp"/>
-</component>
-</collection>
-<collection name="s60">
-<component name="textandloc">
-<unit bldFile="/sf/os/textandloc/group" mrp=""/>
-</component>
-</collection>
-</block>
-</layer>
-</systemModel>
-</SystemDefinition>
\ No newline at end of file
+<!DOCTYPE SystemDefinition [
+<!ELEMENT SystemDefinition ( systemModel )>
+<!ATTLIST SystemDefinition
+ name CDATA #REQUIRED
+ schema CDATA #REQUIRED
+>
+<!-- all paths are relative to the environment variable specified by the root attribute, or SOURCEROOT if not. -->
+
+<!-- System Model Section of DTD -->
+<!ELEMENT systemModel (layer+)>
+
+<!ELEMENT layer (block* | collection*)*>
+<!-- Kernel Services, Base Services, OS Services, Etc -->
+<!ATTLIST layer
+ name CDATA #REQUIRED
+ long-name CDATA #IMPLIED
+ levels NMTOKENS #IMPLIED
+ span CDATA #IMPLIED
+>
+
+<!ELEMENT block (subblock* | collection*)*>
+ <!-- Generic OS services, Comms Services, etc -->
+<!ATTLIST block
+ levels NMTOKENS #IMPLIED
+ span CDATA #IMPLIED
+ level NMTOKEN #IMPLIED
+ name CDATA #REQUIRED
+ long-name CDATA #IMPLIED
+>
+
+<!ELEMENT subblock (collection)*>
+<!-- Cellular Baseband Services, Networking Services, etc -->
+<!ATTLIST subblock
+ name CDATA #REQUIRED
+ long-name CDATA #IMPLIED
+>
+
+<!ELEMENT collection (component)*>
+<!-- Screen Driver, Content Handling, etc -->
+<!ATTLIST collection
+ name CDATA #REQUIRED
+ long-name CDATA #IMPLIED
+ level NMTOKEN #IMPLIED
+>
+
+<!ELEMENT component (unit)*>
+<!-- contains units or is a package or prebuilt -->
+<!ATTLIST component
+ name CDATA #REQUIRED
+ long-name CDATA #IMPLIED
+ deprecated CDATA #IMPLIED
+ introduced CDATA #IMPLIED
+ contract CDATA #IMPLIED
+ plugin (Y|N) "N"
+ filter CDATA #IMPLIED
+ class NMTOKENS #IMPLIED
+ supports CDATA #IMPLIED
+ purpose ( optional | mandatory | development ) "optional"
+>
+
+<!ELEMENT unit EMPTY >
+<!-- must be buildable (bld.inf) -->
+<!-- bldFile may someday be removed in favour of mrp -->
+<!ATTLIST unit
+ mrp CDATA #IMPLIED
+ filter CDATA #IMPLIED
+ bldFile CDATA #IMPLIED
+ root CDATA #IMPLIED
+ version NMTOKEN #IMPLIED
+ prebuilt NMTOKEN #IMPLIED
+ late (Y|N) #IMPLIED
+ priority CDATA #IMPLIED
+>
+]>
+<SystemDefinition name="Symbian^3" schema="2.0.1">
+ <systemModel>
+ <layer name="os" long-name="OS" levels="hw services">
+ <block name="textandloc" level="services" long-name="Text and Localisation Services" levels="encoding util fonts tools text">
+ <collection name="charconvfw" long-name="Character Conversion" level="encoding">
+ <component name="charconv_fw" long-name="Character Encoding and Conversion Framework" purpose="optional">
+ <unit bldFile="/sf/os/textandloc/charconvfw/charconv_fw/group" mrp="/sf/os/textandloc/charconvfw/charconv_fw/group/syslibs_charconv.mrp"/>
+ </component>
+ <component name="charconvplugins" long-name="Character Encoding and Conversion Plugins" purpose="optional" plugin="Y">
+ <unit bldFile="/sf/os/textandloc/charconvfw/charconvplugins/group" mrp="/sf/os/textandloc/charconvfw/charconvplugins/group/syslibs_charconv_plugins.mrp"/>
+ </component>
+ <component name="fatfilenameconversionplugins" long-name="FAT Filename Conversion Plugins" introduced="9.1" purpose="optional" plugin="Y">
+ <unit bldFile="/sf/os/textandloc/charconvfw/fatfilenameconversionplugins/group" mrp="/sf/os/textandloc/charconvfw/fatfilenameconversionplugins/group/syslibs_FATCharsetConv.mrp"/>
+ </component>
+ </collection>
+ <collection name="fontandtxtsrv" long-name="Font and Text Services" level="fonts">
+ <component name="iculayoutengine" long-name="ICU Layout Engine" introduced="9.2" purpose="optional" plugin="Y">
+ <unit bldFile="/sf/os/textandloc/fontservices/textshaperplugin/group" mrp="/sf/os/textandloc/fontservices/textshaperplugin/group/graphics_iculayoutengine.mrp"/>
+ </component>
+ <component name="fontstore" long-name="Font Store" purpose="mandatory">
+ <unit bldFile="/sf/os/textandloc/fontservices/fontstore/group" mrp="/sf/os/textandloc/fontservices/fontstore/group/graphics_fntstore.mrp"/>
+ </component>
+ <component name="textrendering" long-name="Text Rendering" purpose="mandatory" class="placeholder">
+ <!-- placeholder for text code from GDI -->
+ </component>
+ <component name="freetypefontrasteriser" long-name="FreeType Font Rasteriser" purpose="optional" plugin="Y">
+ <unit bldFile="/sf/os/textandloc/fontservices/freetypefontrasteriser/group" mrp="/sf/os/textandloc/fontservices/freetypefontrasteriser/group/graphics_freetype.mrp"/>
+ </component>
+ <component name="referencefonts" long-name="Reference Fonts" introduced="6.0" purpose="optional">
+ <unit bldFile="/sf/os/textandloc/fontservices/referencefonts/group" mrp="/sf/os/textandloc/fontservices/referencefonts/group/graphics_fonts.mrp"/>
+ </component>
+ </collection>
+ <collection name="textlayout" long-name="Text Layout" level="text">
+ <component name="texthandling" long-name="Text Handling" purpose="optional">
+ <unit bldFile="/sf/os/textandloc/textrendering/texthandling/group" mrp="/sf/os/textandloc/textrendering/texthandling/group/app-framework_etext.mrp"/>
+ </component>
+ <component name="textformatting" long-name="Text Formatting" purpose="optional">
+ <unit bldFile="/sf/os/textandloc/textrendering/textformatting/group" mrp="/sf/os/textandloc/textrendering/textformatting/group/app-framework_form.mrp"/>
+ </component>
+ <component name="word" long-name="Word" purpose="development" filter="test">
+ <unit mrp="/sf/os/textandloc/textrendering/word/group/app-framework_word.mrp" bldFile="/sf/os/textandloc/textrendering/word/group"/>
+ </component>
+ </collection>
+ <collection name="textandlocutils" long-name="Text and Localisation Utils" level="util">
+ <!-- components in this collection need to be moved to the right collection.
+ Either move into the units' directories, or create a new textandlocutils directory -->
+ <component name="numbergrouping" filter="s60" long-name="Number Grouping">
+ <unit bldFile="/sf/os/textandloc/charconvfw/numbergrouping/group"/>
+ </component>
+ <component name="jplangutil" filter="s60" long-name="Japanese Language Utilities">
+ <unit bldFile="/sf/os/textandloc/charconvfw/jplangutil/group"/>
+ </component>
+ <component name="sortutil" filter="s60" long-name="Sorting Utility">
+ <unit bldFile="/sf/os/textandloc/charconvfw/sortutil/group"/>
+ </component>
+ <component name="inlinetext" filter="s60" long-name="Inline Text">
+ <unit bldFile="/sf/os/textandloc/charconvfw/inlinetext/group"/>
+ </component>
+ <component name="nearestlangutil" long-name="Nearest Language Util" introduced="^2" purpose="mandatory" class="placeholder">
+ <!-- placeholder for split from bafl -->
+ </component>
+ <component name="numberformatting" long-name="Number Formatting" introduced="7.0s" purpose="optional">
+ <unit bldFile="/sf/os/textandloc/textrendering/numberformatting/group" mrp="/sf/os/textandloc/textrendering/numberformatting/group/app-framework_numberconversion.mrp"/>
+ </component>
+ </collection>
+ <collection name="localesupport" long-name="Locale Support" level="util">
+ <component name="reflocales" long-name="Reference Locales" purpose="optional" plugin="Y">
+ <unit bldFile="/sf/os/textandloc/localisation/localesupport" mrp="/sf/os/textandloc/localisation/localesupport/mmpfiles/base_loce32.mrp"/>
+ </component>
+ <component name="initlocale" long-name="Initialise Locale" introduced="^2" purpose="mandatory" class="placeholder">
+ <!-- placeholder for split from bafl -->
+ </component>
+ </collection>
+ <collection name="textandloctools" long-name="Text and Localisation Tools" level="tools">
+ <component name="fontcompiler" long-name="Font Compiler" purpose="development" class="placeholder PC">
+ <!-- placeholder for split from GDI Tools -->
+ </component>
+ <component name="bitmapfonttools" long-name="Bitmap Font Tools" purpose="development" class="PC">
+ <unit bldFile="/sf/os/graphics/graphicstools/bitmapfonttools/group" mrp="/sf/os/graphics/graphicstools/bitmapfonttools/group/graphics_gdtran.mrp"/>
+ </component>
+ </collection>
+ <collection name="textandloc_info" long-name="Text and Localisation Info" level="text">
+ <component name="textandloc_pub" filter="s60" long-name="Text and Localisation Public Interfaces" class="api">
+ <unit bldFile="/sf/os/textandloc/textandloc_pub/group"/>
+ </component>
+ <component name="textandloc_plat" filter="s60" long-name="Text and Localisation Platform Interfaces" class="api">
+ <unit bldFile="/sf/os/textandloc/textandloc_plat/group"/>
+ </component>
+ <component name="textandloc_metadata" long-name="Text and Localisation Metadata" introduced="^2" purpose="development" class="config PC">
+ <unit mrp="/sf/os/textandloc/textandloc_info/textandloc_metadata/textandloc_metadata.mrp"/>
+ </component>
+ </collection>
+ </block>
+ </layer>
+ </systemModel>
+</SystemDefinition>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/symbian3/os/textandloc/package_definition_3.0.xml Mon Feb 15 18:25:55 2010 +0000
@@ -0,0 +1,93 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<SystemDefinition schema="3.0.0">
+ <package id="textandloc" name="Text and Localisation Services" levels="encoding util fonts tools text">
+ <collection id="charconvfw" name="Character Conversion" level="encoding">
+ <component id="charconv_fw" name="Character Encoding and Conversion Framework" purpose="optional">
+ <unit bldFile="charconvfw/charconv_fw/group" mrp="charconvfw/charconv_fw/group/syslibs_charconv.mrp"/>
+ </component>
+ <component id="charconvplugins" name="Character Encoding and Conversion Plugins" purpose="optional" class="plugin">
+ <unit bldFile="charconvfw/charconvplugins/group" mrp="charconvfw/charconvplugins/group/syslibs_charconv_plugins.mrp"/>
+ </component>
+ <component id="fatfilenameconversionplugins" name="FAT Filename Conversion Plugins" introduced="9.1" purpose="optional" class="plugin">
+ <unit bldFile="charconvfw/fatfilenameconversionplugins/group" mrp="charconvfw/fatfilenameconversionplugins/group/syslibs_FATCharsetConv.mrp"/>
+ </component>
+ </collection>
+ <collection id="fontandtxtsrv" name="Font and Text Services" level="fonts">
+ <component id="iculayoutengine" name="ICU Layout Engine" introduced="9.2" purpose="optional" class="plugin">
+ <unit bldFile="fontservices/textshaperplugin/group" mrp="fontservices/textshaperplugin/group/graphics_iculayoutengine.mrp"/>
+ </component>
+ <component id="fontstore" name="Font Store" purpose="mandatory">
+ <unit bldFile="fontservices/fontstore/group" mrp="fontservices/fontstore/group/graphics_fntstore.mrp"/>
+ </component>
+ <component id="textrendering" name="Text Rendering" purpose="mandatory">
+ <!-- placeholder for text code from GDI -->
+ </component>
+ <component id="freetypefontrasteriser" name="FreeType Font Rasteriser" purpose="optional" class="plugin">
+ <unit bldFile="fontservices/freetypefontrasteriser/group" mrp="fontservices/freetypefontrasteriser/group/graphics_freetype.mrp"/>
+ </component>
+ <component id="referencefonts" name="Reference Fonts" introduced="6.0" purpose="optional">
+ <unit bldFile="fontservices/referencefonts/group" mrp="fontservices/referencefonts/group/graphics_fonts.mrp"/>
+ </component>
+ </collection>
+ <collection id="textlayout" name="Text Layout" level="text">
+ <component id="texthandling" name="Text Handling" purpose="optional">
+ <unit bldFile="textrendering/texthandling/group" mrp="textrendering/texthandling/group/app-framework_etext.mrp"/>
+ </component>
+ <component id="textformatting" name="Text Formatting" purpose="optional">
+ <unit bldFile="textrendering/textformatting/group" mrp="textrendering/textformatting/group/app-framework_form.mrp"/>
+ </component>
+ <component id="word" name="Word" purpose="development" filter="test">
+ <unit mrp="textrendering/word/group/app-framework_word.mrp" bldFile="textrendering/word/group"/>
+ </component>
+ </collection>
+ <collection id="textandlocutils" name="Text and Localisation Utils" level="util">
+ <!-- components in this collection need to be moved to the right collection.
+ Either move into the units' directories, or create a new textandlocutils directory -->
+ <component id="numbergrouping" filter="s60" name="Number Grouping">
+ <unit bldFile="charconvfw/numbergrouping/group"/>
+ </component>
+ <component id="jplangutil" filter="s60" name="Japanese Language Utilities">
+ <unit bldFile="charconvfw/jplangutil/group"/>
+ </component>
+ <component id="sortutil" filter="s60" name="Sorting Utility">
+ <unit bldFile="charconvfw/sortutil/group"/>
+ </component>
+ <component id="inlinetext" filter="s60" name="Inline Text">
+ <unit bldFile="charconvfw/inlinetext/group"/>
+ </component>
+ <component id="nearestlangutil" name="Nearest Language Util" introduced="^2" purpose="mandatory">
+ <!-- placeholder for split from bafl -->
+ </component>
+ <component id="numberformatting" name="Number Formatting" introduced="7.0s" purpose="optional">
+ <unit bldFile="textrendering/numberformatting/group" mrp="textrendering/numberformatting/group/app-framework_numberconversion.mrp"/>
+ </component>
+ </collection>
+ <collection id="localesupport" name="Locale Support" level="util">
+ <component id="reflocales" name="Reference Locales" purpose="optional" class="plugin">
+ <unit bldFile="localisation/localesupport" mrp="localisation/localesupport/mmpfiles/base_loce32.mrp"/>
+ </component>
+ <component id="initlocale" name="Initialise Locale" introduced="^2" purpose="mandatory">
+ <!-- placeholder for split from bafl -->
+ </component>
+ </collection>
+ <collection id="textandloctools" name="Text and Localisation Tools" level="tools">
+ <component id="fontcompiler" name="Font Compiler" purpose="development" target="desktop">
+ <!-- placeholder for split from GDI Tools -->
+ </component>
+ <component id="bitmapfonttools" name="Bitmap Font Tools" purpose="development" target="desktop">
+ <unit bldFile="../graphics/graphicstools/bitmapfonttools/group" mrp="../graphics/graphicstools/bitmapfonttools/group/graphics_gdtran.mrp"/>
+ </component>
+ </collection>
+ <collection id="textandloc_info" name="Text and Localisation Info" level="text">
+ <component id="textandloc_pub" filter="s60" name="Text and Localisation Public Interfaces" class="api">
+ <unit bldFile="textandloc_pub/group"/>
+ </component>
+ <component id="textandloc_plat" filter="s60" name="Text and Localisation Platform Interfaces" class="api">
+ <unit bldFile="textandloc_plat/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"/>
+ </component>
+ </collection>
+ </package>
+</SystemDefinition>
--- a/symbian3/os/usb/package_definition.xml Fri Feb 12 16:37:22 2010 +0000
+++ b/symbian3/os/usb/package_definition.xml Mon Feb 15 18:25:55 2010 +0000
@@ -1,125 +1,110 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE SystemDefinition [
- <!ELEMENT SystemDefinition (systemModel?,SystemBuild?)>
- <!ATTLIST SystemDefinition
- name CDATA #REQUIRED
- schema CDATA #REQUIRED>
- <!ELEMENT systemModel (layer+)>
- <!ELEMENT layer (block*|collection*)*>
- <!ATTLIST layer
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED
- levels NMTOKENS #IMPLIED
- span CDATA #IMPLIED>
- <!ELEMENT block (subblock*|collection*)*>
- <!ATTLIST block
- levels NMTOKENS #IMPLIED
- span CDATA #IMPLIED
- level NMTOKEN #IMPLIED
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED>
- <!ELEMENT subblock (collection)*>
- <!ATTLIST subblock
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED>
- <!ELEMENT collection (component)*>
- <!ATTLIST collection
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED
- level NMTOKEN #IMPLIED>
- <!ELEMENT component (unit)*>
- <!ATTLIST component
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED
- deprecated CDATA #IMPLIED
- introduced CDATA #IMPLIED
- contract CDATA #IMPLIED
- plugin (Y|N) 'N'
- filter CDATA #IMPLIED
- class NMTOKENS #IMPLIED
- supports CDATA #IMPLIED
- purpose (optional|mandatory|development) 'optional'>
- <!ELEMENT unit EMPTY>
- <!ATTLIST unit
- mrp CDATA #IMPLIED
- filter CDATA #IMPLIED
- bldFile CDATA #IMPLIED
- root CDATA #IMPLIED
- version NMTOKEN #IMPLIED
- prebuilt NMTOKEN #IMPLIED
- late (Y|N) #IMPLIED
- priority CDATA #IMPLIED>
- <!ELEMENT SystemBuild (option*|target+|targetList+|list+|configuration+)*>
- <!ATTLIST SystemBuild schema CDATA #REQUIRED>
- <!ELEMENT list (ref+)>
- <!ATTLIST list
- name ID #REQUIRED
- description CDATA #REQUIRED>
- <!ELEMENT ref EMPTY>
- <!ATTLIST ref item CDATA #REQUIRED>
- <!ELEMENT targetList EMPTY>
- <!ATTLIST targetList
- name ID #REQUIRED
- description CDATA #REQUIRED
- target IDREFS #REQUIRED>
- <!ELEMENT target EMPTY>
- <!ATTLIST target
- name ID #REQUIRED
- abldTarget CDATA #REQUIRED
- description CDATA #REQUIRED>
- <!ELEMENT option EMPTY>
- <!ATTLIST option
- name ID #REQUIRED
- abldOption CDATA #REQUIRED
- description CDATA #REQUIRED
- enable (Y|N) #REQUIRED>
- <!ELEMENT configuration (listRef+|ref+|task+)*>
- <!ATTLIST configuration
- name ID #REQUIRED
- description CDATA #REQUIRED
- filter CDATA #REQUIRED>
- <!ELEMENT task (listRef*,(buildLayer|specialInstructions))>
- <!ELEMENT listRef EMPTY>
- <!ATTLIST listRef list CDATA #REQUIRED>
- <!ELEMENT buildLayer EMPTY>
- <!ATTLIST buildLayer
- command CDATA #REQUIRED
- targetList IDREFS #IMPLIED
- unitParallel (Y|N) #REQUIRED
- targetParallel (Y|N) 'N'>
- <!ELEMENT specialInstructions EMPTY>
- <!ATTLIST specialInstructions
- name CDATA #REQUIRED
- cwd CDATA #REQUIRED
- root CDATA #IMPLIED
- command CDATA #REQUIRED>
-]>
-<SystemDefinition schema="2.0.1" name="Symbian^3">
-<systemModel>
-<layer name="os" long-name="OS" levels="hw services">
-<block name="usb" level="services" long-name="USB" levels="adaptation hw-if plugin framework server app-if">
-<collection name="usbldd" long-name="USB Logical Device Drivers" level="hw-if">
-<component name="usbclientdrivers" long-name="USB Client Drivers" introduced="8.1b" purpose="optional">
-<unit bldFile="/sf/os/kernelhwsrv/kernel/eka/drivers/usbc" mrp="/sf/os/kernelhwsrv/kernel/eka/drivers/usbc/base_e32_drivers_usbcli.mrp"/>
-</component>
-</collection>
-<collection name="usbmgmt" long-name="USB Management" level="server">
-<component name="usbmgr" long-name="USB Manager" purpose="optional">
-<unit bldFile="/sf/os/usb/usbmgmt/usbmgr/group" mrp="/sf/os/usb/usbmgmt/usbmgr/group/usb_manager.mrp" version="2"/>
-</component>
-<component name="usbmgrtest" long-name="USB Manager Tests" introduced="7.0" purpose="development">
-<unit mrp="/sf/os/usb/usbmgmt/usbmgrtest/group/usb_test.mrp" version="2"/>
-</component>
-<component name="usbclassandmgrdocs" long-name="USB Class and Manager Documentation" purpose="development" class="doc">
-<unit mrp="/sf/os/usb/usbmgmt/usbclassandmgrdocs/usb_documentation.mrp"/>
-</component>
-</collection>
-<collection name="usb_info" long-name="USB Info" level="app-if">
-<component name="usb_metadata" long-name="USB Metadata" introduced="tb92" purpose="development" class="config PC">
-<unit mrp="/sf/os/usb/usb_info/usb_metadata/usb_metadata.mrp"/>
-</component>
-</collection>
-</block>
-</layer>
-</systemModel>
-</SystemDefinition>
\ No newline at end of file
+<!DOCTYPE SystemDefinition [
+<!ELEMENT SystemDefinition ( systemModel )>
+<!ATTLIST SystemDefinition
+ name CDATA #REQUIRED
+ schema CDATA #REQUIRED
+>
+<!-- all paths are relative to the environment variable specified by the root attribute, or SOURCEROOT if not. -->
+
+<!-- System Model Section of DTD -->
+<!ELEMENT systemModel (layer+)>
+
+<!ELEMENT layer (block* | collection*)*>
+<!-- Kernel Services, Base Services, OS Services, Etc -->
+<!ATTLIST layer
+ name CDATA #REQUIRED
+ long-name CDATA #IMPLIED
+ levels NMTOKENS #IMPLIED
+ span CDATA #IMPLIED
+>
+
+<!ELEMENT block (subblock* | collection*)*>
+ <!-- Generic OS services, Comms Services, etc -->
+<!ATTLIST block
+ levels NMTOKENS #IMPLIED
+ span CDATA #IMPLIED
+ level NMTOKEN #IMPLIED
+ name CDATA #REQUIRED
+ long-name CDATA #IMPLIED
+>
+
+<!ELEMENT subblock (collection)*>
+<!-- Cellular Baseband Services, Networking Services, etc -->
+<!ATTLIST subblock
+ name CDATA #REQUIRED
+ long-name CDATA #IMPLIED
+>
+
+<!ELEMENT collection (component)*>
+<!-- Screen Driver, Content Handling, etc -->
+<!ATTLIST collection
+ name CDATA #REQUIRED
+ long-name CDATA #IMPLIED
+ level NMTOKEN #IMPLIED
+>
+
+<!ELEMENT component (unit)*>
+<!-- contains units or is a package or prebuilt -->
+<!ATTLIST component
+ name CDATA #REQUIRED
+ long-name CDATA #IMPLIED
+ deprecated CDATA #IMPLIED
+ introduced CDATA #IMPLIED
+ contract CDATA #IMPLIED
+ plugin (Y|N) "N"
+ filter CDATA #IMPLIED
+ class NMTOKENS #IMPLIED
+ supports CDATA #IMPLIED
+ purpose ( optional | mandatory | development ) "optional"
+>
+
+<!ELEMENT unit EMPTY >
+<!-- must be buildable (bld.inf) -->
+<!-- bldFile may someday be removed in favour of mrp -->
+<!ATTLIST unit
+ mrp CDATA #IMPLIED
+ filter CDATA #IMPLIED
+ bldFile CDATA #IMPLIED
+ root CDATA #IMPLIED
+ version NMTOKEN #IMPLIED
+ prebuilt NMTOKEN #IMPLIED
+ late (Y|N) #IMPLIED
+ priority CDATA #IMPLIED
+>
+]>
+<SystemDefinition name="Symbian^3" schema="2.0.1">
+ <systemModel>
+ <layer name="os" long-name="OS" levels="hw services">
+ <block name="usb" level="services" long-name="USB" levels="adaptation hw-if plugin framework server app-if">
+ <collection name="usbldd" long-name="USB Logical Device Drivers" level="hw-if">
+ <!-- usbclientdrivers to be moved here from kernelhwsrv-->
+ </collection>
+ <collection name="usbextension" long-name="USB Extension" level="framework">
+ <component name="usbaudioclassdriver" long-name="USB Audi Class Driver" purpose="optional" filter="s60">
+ <unit bldFile="/sf/os/usb/usbextension/usbaudioclassdriver/group"/>
+ </component>
+ </collection>
+ <collection name="usbmgmt" long-name="USB Management" level="server">
+ <component name="usbmgr" long-name="USB Manager" purpose="optional">
+ <unit bldFile="/sf/os/usb/usbmgmt/usbmgr/group" mrp="/sf/os/usb/usbmgmt/usbmgr/group/usb_manager.mrp" version="2"/>
+ </component>
+ <component name="usbmgrtest" long-name="USB Manager Tests" introduced="7.0" purpose="development" filter="test">
+ <unit mrp="/sf/os/usb/usbmgmt/usbmgrtest/group/usb_test.mrp" bldFile="/sf/os/usb/usbmgmt/usbmgrtest/group" version="2"/>
+ </component>
+ <component name="usbclassandmgrdocs" long-name="USB Class and Manager Documentation" purpose="development" class="doc">
+ <unit mrp="/sf/os/usb/usbmgmt/usbclassandmgrdocs/usb_documentation.mrp"/>
+ </component>
+ </collection>
+ <collection name="usb_info" long-name="USB Info" level="app-if">
+ <component name="usb_plat" filter="s60" long-name="USB Platform Interfaces" class="api">
+ <unit bldFile="/sf/os/usb/usb_plat/group"/>
+ </component>
+ <component name="usb_metadata" long-name="USB Metadata" introduced="^3" purpose="development" class="config PC">
+ <unit mrp="/sf/os/usb/usb_info/usb_metadata/usb_metadata.mrp"/>
+ </component>
+ </collection>
+ </block>
+ </layer>
+ </systemModel>
+</SystemDefinition>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/symbian3/os/usb/package_definition_3.0.xml Mon Feb 15 18:25:55 2010 +0000
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<SystemDefinition schema="3.0.0">
+ <package id="usb" name="USB" levels="adaptation hw-if plugin framework server app-if">
+ <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"/>
+ </component>
+ <component id="usbmgrtest" name="USB Manager Tests" introduced="7.0" purpose="development" filter="test">
+ <unit version="2" mrp="usbmgmt/usbmgrtest/group/usb_test.mrp" bldFile="usbmgmt/usbmgrtest/group"/>
+ </component>
+ <component id="usbclassandmgrdocs" name="USB Class and Manager Documentation" purpose="development" class="doc">
+ <unit mrp="usbmgmt/usbclassandmgrdocs/usb_documentation.mrp"/>
+ </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>
+ </collection>
+ </package>
+</SystemDefinition>
--- a/symbian3/os/wlan/package_definition.xml Fri Feb 12 16:37:22 2010 +0000
+++ b/symbian3/os/wlan/package_definition.xml Mon Feb 15 18:25:55 2010 +0000
@@ -1,119 +1,120 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE SystemDefinition [
- <!ELEMENT SystemDefinition (systemModel?,SystemBuild?)>
- <!ATTLIST SystemDefinition
- name CDATA #REQUIRED
- schema CDATA #REQUIRED>
- <!ELEMENT systemModel (layer+)>
- <!ELEMENT layer (block*|collection*)*>
- <!ATTLIST layer
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED
- levels NMTOKENS #IMPLIED
- span CDATA #IMPLIED>
- <!ELEMENT block (subblock*|collection*)*>
- <!ATTLIST block
- levels NMTOKENS #IMPLIED
- span CDATA #IMPLIED
- level NMTOKEN #IMPLIED
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED>
- <!ELEMENT subblock (collection)*>
- <!ATTLIST subblock
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED>
- <!ELEMENT collection (component)*>
- <!ATTLIST collection
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED
- level NMTOKEN #IMPLIED>
- <!ELEMENT component (unit)*>
- <!ATTLIST component
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED
- deprecated CDATA #IMPLIED
- introduced CDATA #IMPLIED
- contract CDATA #IMPLIED
- plugin (Y|N) 'N'
- filter CDATA #IMPLIED
- class NMTOKENS #IMPLIED
- supports CDATA #IMPLIED
- purpose (optional|mandatory|development) 'optional'>
- <!ELEMENT unit EMPTY>
- <!ATTLIST unit
- mrp CDATA #IMPLIED
- filter CDATA #IMPLIED
- bldFile CDATA #IMPLIED
- root CDATA #IMPLIED
- version NMTOKEN #IMPLIED
- prebuilt NMTOKEN #IMPLIED
- late (Y|N) #IMPLIED
- priority CDATA #IMPLIED>
- <!ELEMENT SystemBuild (option*|target+|targetList+|list+|configuration+)*>
- <!ATTLIST SystemBuild schema CDATA #REQUIRED>
- <!ELEMENT list (ref+)>
- <!ATTLIST list
- name ID #REQUIRED
- description CDATA #REQUIRED>
- <!ELEMENT ref EMPTY>
- <!ATTLIST ref item CDATA #REQUIRED>
- <!ELEMENT targetList EMPTY>
- <!ATTLIST targetList
- name ID #REQUIRED
- description CDATA #REQUIRED
- target IDREFS #REQUIRED>
- <!ELEMENT target EMPTY>
- <!ATTLIST target
- name ID #REQUIRED
- abldTarget CDATA #REQUIRED
- description CDATA #REQUIRED>
- <!ELEMENT option EMPTY>
- <!ATTLIST option
- name ID #REQUIRED
- abldOption CDATA #REQUIRED
- description CDATA #REQUIRED
- enable (Y|N) #REQUIRED>
- <!ELEMENT configuration (listRef+|ref+|task+)*>
- <!ATTLIST configuration
- name ID #REQUIRED
- description CDATA #REQUIRED
- filter CDATA #REQUIRED>
- <!ELEMENT task (listRef*,(buildLayer|specialInstructions))>
- <!ELEMENT listRef EMPTY>
- <!ATTLIST listRef list CDATA #REQUIRED>
- <!ELEMENT buildLayer EMPTY>
- <!ATTLIST buildLayer
- command CDATA #REQUIRED
- targetList IDREFS #IMPLIED
- unitParallel (Y|N) #REQUIRED
- targetParallel (Y|N) 'N'>
- <!ELEMENT specialInstructions EMPTY>
- <!ATTLIST specialInstructions
- name CDATA #REQUIRED
- cwd CDATA #REQUIRED
- root CDATA #IMPLIED
- command CDATA #REQUIRED>
-]>
-<SystemDefinition schema="2.0.1" name="Symbian^3">
-<systemModel>
-<layer name="os" long-name="OS" levels="hw services">
-<block name="wlan" level="services" long-name="WLAN" levels="hw low mid high tools test">
-<collection name="wlanapitest" long-name="WLAN API Tests" level="test">
-<component name="wlanhaitest" long-name="WLAN HAI Tests" introduced="tb91" purpose="development">
-<unit mrp="/sf/os/wlan/wlanapitest/wlanhaitest/group/wlanhaitest.mrp"/>
-</component>
-</collection>
-<collection name="wlan_info" long-name="WLAN Info" level="test">
-<component name="wlan_metadata" long-name="WLAN Metadata" introduced="tb91" purpose="development" class="config PC">
-<unit mrp="/sf/os/wlan/wlan_info/wlan_metadata/wlan_metadata.mrp"/>
-</component>
-</collection>
-<collection name="s60">
-<component name="wlan">
-<unit bldFile="/sf/os/wlan/group" mrp=""/>
-</component>
-</collection>
-</block>
-</layer>
-</systemModel>
-</SystemDefinition>
\ No newline at end of file
+<!DOCTYPE SystemDefinition [
+<!ELEMENT SystemDefinition ( systemModel )>
+<!ATTLIST SystemDefinition
+ name CDATA #REQUIRED
+ schema CDATA #REQUIRED
+>
+<!-- all paths are relative to the environment variable specified by the root attribute, or SOURCEROOT if not. -->
+
+<!-- System Model Section of DTD -->
+<!ELEMENT systemModel (layer+)>
+
+<!ELEMENT layer (block* | collection*)*>
+<!-- Kernel Services, Base Services, OS Services, Etc -->
+<!ATTLIST layer
+ name CDATA #REQUIRED
+ long-name CDATA #IMPLIED
+ levels NMTOKENS #IMPLIED
+ span CDATA #IMPLIED
+>
+
+<!ELEMENT block (subblock* | collection*)*>
+ <!-- Generic OS services, Comms Services, etc -->
+<!ATTLIST block
+ levels NMTOKENS #IMPLIED
+ span CDATA #IMPLIED
+ level NMTOKEN #IMPLIED
+ name CDATA #REQUIRED
+ long-name CDATA #IMPLIED
+>
+
+<!ELEMENT subblock (collection)*>
+<!-- Cellular Baseband Services, Networking Services, etc -->
+<!ATTLIST subblock
+ name CDATA #REQUIRED
+ long-name CDATA #IMPLIED
+>
+
+<!ELEMENT collection (component)*>
+<!-- Screen Driver, Content Handling, etc -->
+<!ATTLIST collection
+ name CDATA #REQUIRED
+ long-name CDATA #IMPLIED
+ level NMTOKEN #IMPLIED
+>
+
+<!ELEMENT component (unit)*>
+<!-- contains units or is a package or prebuilt -->
+<!ATTLIST component
+ name CDATA #REQUIRED
+ long-name CDATA #IMPLIED
+ deprecated CDATA #IMPLIED
+ introduced CDATA #IMPLIED
+ contract CDATA #IMPLIED
+ plugin (Y|N) "N"
+ filter CDATA #IMPLIED
+ class NMTOKENS #IMPLIED
+ supports CDATA #IMPLIED
+ purpose ( optional | mandatory | development ) "optional"
+>
+
+<!ELEMENT unit EMPTY >
+<!-- must be buildable (bld.inf) -->
+<!-- bldFile may someday be removed in favour of mrp -->
+<!ATTLIST unit
+ mrp CDATA #IMPLIED
+ filter CDATA #IMPLIED
+ bldFile CDATA #IMPLIED
+ root CDATA #IMPLIED
+ version NMTOKEN #IMPLIED
+ prebuilt NMTOKEN #IMPLIED
+ late (Y|N) #IMPLIED
+ priority CDATA #IMPLIED
+>
+]>
+<SystemDefinition name="Symbian^3" schema="2.0.1">
+ <systemModel>
+ <layer name="os" long-name="OS" levels="hw services">
+ <block name="wlan" level="services" long-name="WLAN" levels="hw low mid high tools test">
+ <collection name="wlan_bearer" long-name="WLAN Bearer" level="hw">
+ <component name="wlanpsmplugin" filter="s60" long-name="WLAN PSM Plugin" plugin="Y">
+ <unit bldFile="/sf/os/wlan/wlan_bearer/wlanpsmplugin/group"/>
+ </component>
+ <component name="wlanagent" filter="s60" long-name="WLAN Agent">
+ <unit bldFile="/sf/os/wlan/wlan_bearer/wlanagent/group"/>
+ </component>
+ <component name="wlandbif_cd" filter="s60" long-name="WLAN CommsDat interface">
+ <unit bldFile="/sf/os/wlan/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 name="wlanengine" filter="s60" long-name="WLAN Engine">
+ <unit bldFile="/sf/os/wlan/wlan_bearer/wlanengine/wlan_symbian/wlanengine_symbian_3.1/group"/>
+ </component>
+ <component name="wlanldd" filter="s60" long-name="WLAN LDD">
+ <unit bldFile="/sf/os/wlan/wlan_bearer/wlanldd/wlan_symbian/wlanldd_symbian/group"/>
+ </component>
+ <component name="wlannwif" filter="s60" long-name="WLAN Network Interface">
+ <unit bldFile="/sf/os/wlan/wlan_bearer/wlannwif/group"/>
+ </component>
+ </collection>
+ <collection name="wlanapitest" long-name="WLAN API Tests" level="test">
+ <component name="wlanhaitest" long-name="WLAN HAI Tests" introduced="^2" purpose="development" filter="test">
+ <unit mrp="/sf/os/wlan/wlanapitest/wlanhaitest/group/wlanhaitest.mrp" bldFile="/sf/os/wlan/wlanapitest/wlanhaitest/group"/>
+ </component>
+ </collection>
+ <collection name="wlan_info" long-name="WLAN Info" level="test">
+ <component name="wlan_pub" filter="s60" long-name="WLAN Public Interfaces" class="api">
+ <unit bldFile="/sf/os/wlan/wlan_pub/group"/>
+ </component>
+ <component name="wlan_plat" filter="s60" long-name="WLAN Platform Interfaces" class="api">
+ <unit bldFile="/sf/os/wlan/wlan_plat/group"/>
+ </component>
+ <component name="wlan_metadata" long-name="WLAN Metadata" introduced="^2" purpose="development" class="config PC">
+ <unit mrp="/sf/os/wlan/wlan_info/wlan_metadata/wlan_metadata.mrp"/>
+ </component>
+ </collection>
+ </block>
+ </layer>
+ </systemModel>
+</SystemDefinition>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/symbian3/os/wlan/package_definition_3.0.xml Mon Feb 15 18:25:55 2010 +0000
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<SystemDefinition schema="3.0.0">
+ <package id="wlan" name="WLAN" levels="hw low mid high tools test">
+ <collection id="wlan_bearer" name="WLAN Bearer" level="hw">
+ <component id="wlanpsmplugin" filter="s60" name="WLAN PSM Plugin" class="plugin">
+ <unit bldFile="wlan_bearer/wlanpsmplugin/group"/>
+ </component>
+ <component id="wlanagent" filter="s60" name="WLAN Agent">
+ <unit bldFile="wlan_bearer/wlanagent/group"/>
+ </component>
+ <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>
+ <component id="wlanldd" filter="s60" name="WLAN LDD">
+ <unit bldFile="wlan_bearer/wlanldd/wlan_symbian/wlanldd_symbian/group"/>
+ </component>
+ <component id="wlannwif" filter="s60" name="WLAN Network Interface">
+ <unit bldFile="wlan_bearer/wlannwif/group"/>
+ </component>
+ </collection>
+ <collection id="wlanapitest" name="WLAN API Tests" level="test">
+ <component id="wlanhaitest" name="WLAN HAI Tests" introduced="^2" purpose="development" filter="test">
+ <unit mrp="wlanapitest/wlanhaitest/group/wlanhaitest.mrp" bldFile="wlanapitest/wlanhaitest/group"/>
+ </component>
+ </collection>
+ <collection id="wlan_info" name="WLAN Info" level="test">
+ <component id="wlan_pub" filter="s60" name="WLAN Public Interfaces" class="api">
+ <unit bldFile="wlan_pub/group"/>
+ </component>
+ <component id="wlan_plat" filter="s60" name="WLAN Platform Interfaces" class="api">
+ <unit bldFile="wlan_plat/group"/>
+ </component>
+ <component id="wlan_metadata" name="WLAN Metadata" class="config" introduced="^2" purpose="development" target="desktop">
+ <unit mrp="wlan_info/wlan_metadata/wlan_metadata.mrp"/>
+ </component>
+ </collection>
+ </package>
+</SystemDefinition>
--- a/symbian3/os/xmlsrv/package_definition.xml Fri Feb 12 16:37:22 2010 +0000
+++ b/symbian3/os/xmlsrv/package_definition.xml Mon Feb 15 18:25:55 2010 +0000
@@ -1,134 +1,128 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE SystemDefinition [
- <!ELEMENT SystemDefinition (systemModel?,SystemBuild?)>
- <!ATTLIST SystemDefinition
- name CDATA #REQUIRED
- schema CDATA #REQUIRED>
- <!ELEMENT systemModel (layer+)>
- <!ELEMENT layer (block*|collection*)*>
- <!ATTLIST layer
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED
- levels NMTOKENS #IMPLIED
- span CDATA #IMPLIED>
- <!ELEMENT block (subblock*|collection*)*>
- <!ATTLIST block
- levels NMTOKENS #IMPLIED
- span CDATA #IMPLIED
- level NMTOKEN #IMPLIED
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED>
- <!ELEMENT subblock (collection)*>
- <!ATTLIST subblock
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED>
- <!ELEMENT collection (component)*>
- <!ATTLIST collection
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED
- level NMTOKEN #IMPLIED>
- <!ELEMENT component (unit)*>
- <!ATTLIST component
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED
- deprecated CDATA #IMPLIED
- introduced CDATA #IMPLIED
- contract CDATA #IMPLIED
- plugin (Y|N) 'N'
- filter CDATA #IMPLIED
- class NMTOKENS #IMPLIED
- supports CDATA #IMPLIED
- purpose (optional|mandatory|development) 'optional'>
- <!ELEMENT unit EMPTY>
- <!ATTLIST unit
- mrp CDATA #IMPLIED
- filter CDATA #IMPLIED
- bldFile CDATA #IMPLIED
- root CDATA #IMPLIED
- version NMTOKEN #IMPLIED
- prebuilt NMTOKEN #IMPLIED
- late (Y|N) #IMPLIED
- priority CDATA #IMPLIED>
- <!ELEMENT SystemBuild (option*|target+|targetList+|list+|configuration+)*>
- <!ATTLIST SystemBuild schema CDATA #REQUIRED>
- <!ELEMENT list (ref+)>
- <!ATTLIST list
- name ID #REQUIRED
- description CDATA #REQUIRED>
- <!ELEMENT ref EMPTY>
- <!ATTLIST ref item CDATA #REQUIRED>
- <!ELEMENT targetList EMPTY>
- <!ATTLIST targetList
- name ID #REQUIRED
- description CDATA #REQUIRED
- target IDREFS #REQUIRED>
- <!ELEMENT target EMPTY>
- <!ATTLIST target
- name ID #REQUIRED
- abldTarget CDATA #REQUIRED
- description CDATA #REQUIRED>
- <!ELEMENT option EMPTY>
- <!ATTLIST option
- name ID #REQUIRED
- abldOption CDATA #REQUIRED
- description CDATA #REQUIRED
- enable (Y|N) #REQUIRED>
- <!ELEMENT configuration (listRef+|ref+|task+)*>
- <!ATTLIST configuration
- name ID #REQUIRED
- description CDATA #REQUIRED
- filter CDATA #REQUIRED>
- <!ELEMENT task (listRef*,(buildLayer|specialInstructions))>
- <!ELEMENT listRef EMPTY>
- <!ATTLIST listRef list CDATA #REQUIRED>
- <!ELEMENT buildLayer EMPTY>
- <!ATTLIST buildLayer
- command CDATA #REQUIRED
- targetList IDREFS #IMPLIED
- unitParallel (Y|N) #REQUIRED
- targetParallel (Y|N) 'N'>
- <!ELEMENT specialInstructions EMPTY>
- <!ATTLIST specialInstructions
- name CDATA #REQUIRED
- cwd CDATA #REQUIRED
- root CDATA #IMPLIED
- command CDATA #REQUIRED>
-]>
-<SystemDefinition schema="2.0.1" name="Symbian^3">
-<systemModel>
-<layer name="os" long-name="OS" levels="hw services">
-<block name="xmlsrv" level="services" long-name="XML Services" levels="plugin server framework generic specific">
-<collection name="xml" long-name="XML" level="generic">
-<component name="xmlfw" long-name="XML Framework" introduced="7.0s" purpose="optional">
-<unit bldFile="/sf/os/xmlsrv/xml/xmlfw/group" mrp="/sf/os/xmlsrv/xml/xmlfw/group/syslibs_xml.mrp"/>
-</component>
-<component name="libxml2libs" long-name="Libxml2 Libraries" introduced="tb92" purpose="optional">
-<unit bldFile="/sf/os/xmlsrv/xml/libxml2libs/group" mrp="/sf/os/xmlsrv/xml/libxml2libs/group/syslibs_libxml2.mrp"/>
-</component>
-<component name="xmldomandxpath" long-name="XML DOM and XPath" introduced="tb92" purpose="optional">
-<unit bldFile="/sf/os/xmlsrv/xml/xmldomandxpath/group" mrp="/sf/os/xmlsrv/xml/xmldomandxpath/group/syslibs_xmldom.mrp"/>
-</component>
-<component name="xmlexpatparser" long-name="XML Expat Parser" introduced="7.0s" purpose="optional" plugin="Y">
-<unit bldFile="/sf/os/xmlsrv/xml/xmlexpatparser/group" mrp="/sf/os/xmlsrv/xml/xmlexpatparser/group/syslibs_xmlparser.mrp"/>
-</component>
-<component name="xmllibxml2parser" long-name="XML Libxml2 Parser" introduced="tb92" purpose="optional" plugin="Y">
-<unit bldFile="/sf/os/xmlsrv/xml/xmllibxml2parser/group" mrp="/sf/os/xmlsrv/xml/xmllibxml2parser/group/syslibs_xmlparser2.mrp"/>
-</component>
-<component name="wbxmlparser" long-name="WBXML Parser" introduced="7.0s" purpose="optional" plugin="Y">
-<unit bldFile="/sf/os/xmlsrv/xml/wbxmlparser/group" mrp="/sf/os/xmlsrv/xml/wbxmlparser/group/syslibs_wbxmlparser.mrp"/>
-</component>
-</collection>
-<collection name="xmlsrv_info" long-name="XML Services Info" level="specific">
-<component name="xmlsrv_metadata" long-name="XML Services Metadata" introduced="tb91" purpose="development" class="config PC">
-<unit mrp="/sf/os/xmlsrv/xmlsrv_info/xmlsrv_metadata/xmlsrv_metadata.mrp"/>
-</component>
-</collection>
-<collection name="s60">
-<component name="xmlsrv">
-<unit bldFile="/sf/os/xmlsrv/group" mrp=""/>
-</component>
-</collection>
-</block>
-</layer>
-</systemModel>
-</SystemDefinition>
\ No newline at end of file
+<!DOCTYPE SystemDefinition [
+<!ELEMENT SystemDefinition ( systemModel )>
+<!ATTLIST SystemDefinition
+ name CDATA #REQUIRED
+ schema CDATA #REQUIRED
+>
+<!-- all paths are relative to the environment variable specified by the root attribute, or SOURCEROOT if not. -->
+
+<!-- System Model Section of DTD -->
+<!ELEMENT systemModel (layer+)>
+
+<!ELEMENT layer (block* | collection*)*>
+<!-- Kernel Services, Base Services, OS Services, Etc -->
+<!ATTLIST layer
+ name CDATA #REQUIRED
+ long-name CDATA #IMPLIED
+ levels NMTOKENS #IMPLIED
+ span CDATA #IMPLIED
+>
+
+<!ELEMENT block (subblock* | collection*)*>
+ <!-- Generic OS services, Comms Services, etc -->
+<!ATTLIST block
+ levels NMTOKENS #IMPLIED
+ span CDATA #IMPLIED
+ level NMTOKEN #IMPLIED
+ name CDATA #REQUIRED
+ long-name CDATA #IMPLIED
+>
+
+<!ELEMENT subblock (collection)*>
+<!-- Cellular Baseband Services, Networking Services, etc -->
+<!ATTLIST subblock
+ name CDATA #REQUIRED
+ long-name CDATA #IMPLIED
+>
+
+<!ELEMENT collection (component)*>
+<!-- Screen Driver, Content Handling, etc -->
+<!ATTLIST collection
+ name CDATA #REQUIRED
+ long-name CDATA #IMPLIED
+ level NMTOKEN #IMPLIED
+>
+
+<!ELEMENT component (unit)*>
+<!-- contains units or is a package or prebuilt -->
+<!ATTLIST component
+ name CDATA #REQUIRED
+ long-name CDATA #IMPLIED
+ deprecated CDATA #IMPLIED
+ introduced CDATA #IMPLIED
+ contract CDATA #IMPLIED
+ plugin (Y|N) "N"
+ filter CDATA #IMPLIED
+ class NMTOKENS #IMPLIED
+ supports CDATA #IMPLIED
+ purpose ( optional | mandatory | development ) "optional"
+>
+
+<!ELEMENT unit EMPTY >
+<!-- must be buildable (bld.inf) -->
+<!-- bldFile may someday be removed in favour of mrp -->
+<!ATTLIST unit
+ mrp CDATA #IMPLIED
+ filter CDATA #IMPLIED
+ bldFile CDATA #IMPLIED
+ root CDATA #IMPLIED
+ version NMTOKEN #IMPLIED
+ prebuilt NMTOKEN #IMPLIED
+ late (Y|N) #IMPLIED
+ priority CDATA #IMPLIED
+>
+]>
+<SystemDefinition name="Symbian^3" schema="2.0.1">
+ <systemModel>
+ <layer name="os" long-name="OS" levels="hw services">
+ <block name="xmlsrv" level="services" long-name="XML Services" levels="plugin server framework generic specific">
+ <collection name="xmlsecurityengine" long-name="XML Security Engine" level="framework">
+ <component name="xmlseccertman" filter="s60" long-name="XML Security Certificate Manager">
+ <unit bldFile="/sf/os/xmlsrv/xmlsecurityengine/xmlseccertman/group"/>
+ </component>
+ <component name="xmlsec" filter="s60" long-name="XML Security">
+ <unit bldFile="/sf/os/xmlsrv/xmlsecurityengine/xmlsec/group"/>
+ </component>
+ <component name="xmlseccrypto" filter="s60" long-name="XML Security Crypto">
+ <unit bldFile="/sf/os/xmlsrv/xmlsecurityengine/xmlseccrypto/group"/>
+ </component>
+ <component name="xmlsecwrapper" filter="s60" long-name="XML Security Wrapper">
+ <unit bldFile="/sf/os/xmlsrv/xmlsecurityengine/xmlsecwrapper/group"/>
+ </component>
+ </collection>
+ <collection name="xml" long-name="XML" level="generic">
+ <component name="xmlfw" long-name="XML Framework" introduced="7.0s" purpose="optional">
+ <unit bldFile="/sf/os/xmlsrv/xml/xmlfw/group" mrp="/sf/os/xmlsrv/xml/xmlfw/group/syslibs_xml.mrp"/>
+ </component>
+ <component name="libxml2libs" long-name="Libxml2 Libraries" introduced="^3" purpose="optional">
+ <unit bldFile="/sf/os/xmlsrv/xml/libxml2libs/group" mrp="/sf/os/xmlsrv/xml/libxml2libs/group/syslibs_libxml2.mrp"/>
+ </component>
+ <component name="legacyminidomparser" long-name="Legacy Mini-DOM Parser" introduced="7.0s" purpose="optional">
+ <unit bldFile="/sf/os/xmlsrv/xml/legacyminidomparser/GROUP" mrp="/sf/os/xmlsrv/xml/legacyminidomparser/GROUP/syslibs_legacyminidomparser.mrp"/>
+ </component>
+ <component name="xmldomandxpath" long-name="XML DOM and XPath" introduced="^3" purpose="optional">
+ <unit bldFile="/sf/os/xmlsrv/xml/xmldomandxpath/group" mrp="/sf/os/xmlsrv/xml/xmldomandxpath/group/syslibs_xmldom.mrp"/>
+ </component>
+ <component name="xmlexpatparser" long-name="XML Expat Parser" introduced="7.0s" purpose="optional" plugin="Y">
+ <unit bldFile="/sf/os/xmlsrv/xml/xmlexpatparser/group" mrp="/sf/os/xmlsrv/xml/xmlexpatparser/group/syslibs_xmlparser.mrp"/>
+ </component>
+ <component name="xmllibxml2parser" long-name="XML Libxml2 Parser" introduced="^3" purpose="optional" plugin="Y">
+ <unit bldFile="/sf/os/xmlsrv/xml/xmllibxml2parser/group" mrp="/sf/os/xmlsrv/xml/xmllibxml2parser/group/syslibs_xmlparser2.mrp"/>
+ </component>
+ <component name="wbxmlparser" long-name="WBXML Parser" introduced="7.0s" purpose="optional" plugin="Y">
+ <unit bldFile="/sf/os/xmlsrv/xml/wbxmlparser/group" mrp="/sf/os/xmlsrv/xml/wbxmlparser/group/syslibs_wbxmlparser.mrp"/>
+ </component>
+ </collection>
+ <collection name="xmlsrv_info" long-name="XML Services Info" level="specific">
+ <component name="xmlsrv_plat" filter="s60" long-name="XML Services Platform Interfaces" class="api">
+ <unit bldFile="/sf/os/xmlsrv/xmlsrv_plat/group"/>
+ </component>
+ <component name="xmlsrv_metadata" long-name="XML Services Metadata" introduced="^2" purpose="development" class="config PC">
+ <unit mrp="/sf/os/xmlsrv/xmlsrv_info/xmlsrv_metadata/xmlsrv_metadata.mrp"/>
+ </component>
+ </collection>
+ </block>
+ </layer>
+ </systemModel>
+</SystemDefinition>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/symbian3/os/xmlsrv/package_definition_3.0.xml Mon Feb 15 18:25:55 2010 +0000
@@ -0,0 +1,50 @@
+<?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="xmlsecurityengine" name="XML Security Engine" level="framework">
+ <component id="xmlseccertman" filter="s60" name="XML Security Certificate Manager">
+ <unit bldFile="xmlsecurityengine/xmlseccertman/group"/>
+ </component>
+ <component id="xmlsec" filter="s60" name="XML Security">
+ <unit bldFile="xmlsecurityengine/xmlsec/group"/>
+ </component>
+ <component id="xmlseccrypto" filter="s60" name="XML Security Crypto">
+ <unit bldFile="xmlsecurityengine/xmlseccrypto/group"/>
+ </component>
+ <component id="xmlsecwrapper" filter="s60" name="XML Security Wrapper">
+ <unit bldFile="xmlsecurityengine/xmlsecwrapper/group"/>
+ </component>
+ </collection>
+ <collection id="xml" name="XML" level="generic">
+ <component id="xmlfw" name="XML Framework" introduced="7.0s" purpose="optional">
+ <unit bldFile="xml/xmlfw/group" mrp="xml/xmlfw/group/syslibs_xml.mrp"/>
+ </component>
+ <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="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">
+ <unit bldFile="xml/xmldomandxpath/group" mrp="xml/xmldomandxpath/group/syslibs_xmldom.mrp"/>
+ </component>
+ <component id="xmlexpatparser" name="XML Expat Parser" introduced="7.0s" purpose="optional" class="plugin">
+ <unit bldFile="xml/xmlexpatparser/group" mrp="xml/xmlexpatparser/group/syslibs_xmlparser.mrp"/>
+ </component>
+ <component id="xmllibxml2parser" name="XML Libxml2 Parser" introduced="^3" purpose="optional" class="plugin">
+ <unit bldFile="xml/xmllibxml2parser/group" mrp="xml/xmllibxml2parser/group/syslibs_xmlparser2.mrp"/>
+ </component>
+ <component id="wbxmlparser" name="WBXML Parser" introduced="7.0s" purpose="optional" class="plugin">
+ <unit bldFile="xml/wbxmlparser/group" mrp="xml/wbxmlparser/group/syslibs_wbxmlparser.mrp"/>
+ </component>
+ </collection>
+ <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"/>
+ </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"/>
+ </component>
+ </collection>
+ </package>
+</SystemDefinition>