--- a/package_definition.xml Fri Apr 30 17:07:47 2010 +0300
+++ b/package_definition.xml Fri Aug 06 12:57:10 2010 +0300
@@ -1,213 +1,245 @@
<?xml version="1.0" encoding="UTF-8"?>
<SystemDefinition schema="3.0.0">
- <package id="dlnasrv" name="DLNA Services" levels="stack server ctrl framework plugin">
- <collection id="upnpavcontrolpoint" name="UPnP A/V Control Point" level="plugin">
- <component id="avcontrolframework" filter="s60" name="A/V Control Famework" introduced="9.1" deprecated="^3">
- <unit bldFile="upnpavcontrolpoint/avcontrolframework/group"/>
- </component>
- <component id="upnpavcontrolpoint_build" filter="s60" name="UPnP A/V Control Point Build" introduced="9.1" deprecated="^3">
- <unit bldFile="upnpavcontrolpoint/group"/>
- </component>
- </collection>
- <collection id="upnpmediaserver" name="UPnP Media Server" level="server">
- <component id="avobjects" filter="s60" name="A/V Objects">
- <unit bldFile="upnpmediaserver/avobjects/group"/>
- </component>
- <component id="mediaserverclient" filter="s60" name="Media Server Client">
- <unit bldFile="upnpmediaserver/mediaserverclient/group"/>
- </component>
- <component id="connectionmanagerservice" filter="s60" name="Connection Manager Service">
- <unit bldFile="upnpmediaserver/connectionmanagerservice/group"/>
- </component>
- <component id="contentdirectoryservice" filter="s60" name="Content Directory Service">
- <unit bldFile="upnpmediaserver/contentdirectoryservice/group"/>
- </component>
- <component id="mediaserverengine" filter="s60" name="Media Server Engine">
- <unit bldFile="upnpmediaserver/mediaserverengine/group"/>
- </component>
- <component id="upnpmediaserver_build" filter="s60" name="UPnP Media Server Build">
- <!-- consider moving content into above components -->
- <unit bldFile="upnpmediaserver/group"/>
- </component>
- </collection>
- <collection id="upnpstack" name="UPnP Stack" level="stack">
+ <package id="dlnasrv" name="DLNA Services" levels="stack server ctrl framework plugin">
+ <!-- uncomment all the units when configuration is in place, they're currently #included from other xxx_build components -->
+ <collection id="dlnasrv_plat" name="DLNA Services Platform Interfaces" level="plugin">
+ <component id="upnp_media_server_settings_api" name="UPnP Media Server Settings API" class="api" filter="s60">
+ <meta rel="Api" href="dlnasrv_plat/upnp_media_server_settings_api/upnp_media_server_settings_api.metaxml"/>
+ <unit bldFile="dlnasrv_plat/upnp_media_server_settings_api/group"/>
+ </component>
+ <component id="upnp_av_objects_api" name="UPnP A/V Objects API" class="api" filter="s60">
+ <meta rel="Api" href="dlnasrv_plat/upnp_av_objects_api/upnp_av_objects_api.metaxml"/>
+ <unit bldFile="dlnasrv_plat/upnp_av_objects_api/group"/>
+ </component>
+ <component id="upnp_media_server_api" name="UPnP Media Server API" class="api" filter="s60">
+ <meta rel="Api" href="dlnasrv_plat/upnp_media_server_api/upnp_media_server_api.metaxml"/>
+ <unit bldFile="dlnasrv_plat/upnp_media_server_api/group"/>
+ </component>
+ <component id="upnp_security_plugin_api" name="UPnP Security Plugin API" class="api" filter="s60">
+ <meta rel="Api" href="dlnasrv_plat/upnp_security_plugin_api/upnp_security_plugin_api.metaxml"/>
+ <unit bldFile="dlnasrv_plat/upnp_security_plugin_api/group"/>
+ </component>
+ <component id="upnp_avcp_api" name="UPnP AVCP API" class="api" filter="s60">
+ <meta rel="Api" href="dlnasrv_plat/upnp_avcp_api/upnp_avcp_api.metaxml"/>
+ <unit bldFile="dlnasrv_plat/upnp_avcp_api/group"/>
+ </component>
+ <component id="upnp_media_server_metadata_api" name="UPnP Media Server Metadata API" class="api" filter="s60">
+ <meta rel="Api" href="dlnasrv_plat/upnp_media_server_metadata_api/upnp_media_server_metadata_api.metaxml"/>
+ <unit bldFile="dlnasrv_plat/upnp_media_server_metadata_api/group"/>
+ </component>
+ <component id="upnp_command_api" name="UPnP Command API" class="api" filter="s60">
+ <meta rel="Api" href="dlnasrv_plat/upnp_command_api/upnp_command_api.metaxml"/>
+ <unit bldFile="dlnasrv_plat/upnp_command_api/group"/>
+ </component>
+ <component id="upnp_plugin_api" name="UPnP Plugin API" class="api" filter="s60">
+ <meta rel="Api" href="dlnasrv_plat/upnp_plugin_api/upnp_plugin_api.metaxml"/>
+ <unit bldFile="dlnasrv_plat/upnp_plugin_api/group" filter="!test"/>
+ <!-- should only have one test unit in a component. Need to #include from a common bld.inf-->
+ <unit bldFile="dlnasrv_plat/upnp_plugin_api/tsrc/testplugin/group" filter="test,api_test"/>
+ <unit bldFile="dlnasrv_plat/upnp_plugin_api/tsrc/upnpextensionpluginiftest/group" filter="test,api_test"/>
+ </component>
+ </collection>
+ <collection id="upnpavcontrolpoint" name="UPnP A/V Control Point" level="plugin">
+ <component id="avcontrolframework" filter="s60" name="A/V Control Famework" introduced="9.1" deprecated="^3">
+ <unit bldFile="upnpavcontrolpoint/avcontrolframework/group" filter="!test"/>
+ <unit bldFile="upnpavcontrolpoint/avcontrolframework/tsrc/public/basic/group" filter="test,api_test"/>
+ </component>
+ <component id="upnpavcontrolpoint_rom" filter="s60" name="UPnP A/V Control Point ROM" introduced="9.1" deprecated="^3">
+ <unit bldFile="upnpavcontrolpoint/rom"/>
+ </component>
+ </collection>
+ <collection id="upnpmediaserver" name="UPnP Media Server" level="server">
+ <component id="avobjects" filter="s60" name="A/V Objects">
+ <unit bldFile="upnpmediaserver/avobjects/group" filter="!test"/>
+ <unit bldFile="upnpmediaserver/avobjects/tsrc/public/basic/group" filter="test,api_test"/>
+ </component>
+ <component id="mediaserverclient" filter="s60" name="Media Server Client">
+ <unit bldFile="upnpmediaserver/mediaserverclient/group" filter="!test"/>
+ <unit bldFile="upnpmediaserver/mediaserverclient/tsrc/public/basic/group" filter="test,api_test"/>
+ </component>
+ <component id="connectionmanagerservice" filter="s60" name="Connection Manager Service">
+ <unit bldFile="upnpmediaserver/connectionmanagerservice/group"/>
+ </component>
+ <component id="contentdirectoryservice" filter="s60" name="Content Directory Service">
+ <unit bldFile="upnpmediaserver/contentdirectoryservice/group"/>
+ </component>
+ <component id="mediaserverengine" filter="s60" name="Media Server Engine">
+ <unit bldFile="upnpmediaserver/mediaserverengine/group"/>
+ </component>
+ <component id="upnpmediaserver_rom" filter="s60" name="UPnP Media Server ROM">
+ <unit bldFile="upnpmediaserver/rom"/>
+ </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" filter="!test"/>
+ <unit bldFile="upnpavcontroller/upnpxmlparser/tsrc/upnpxmlparsertest/group" filter="test,api_test"/>
+ </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_rom" filter="s60" name="UPnP A/V Controller ROM" introduced="^2">
+ <unit bldFile="upnpavcontroller/rom"/>
+ </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 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="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="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="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="upnpcommand" filter="s60" name="UPnP Command" introduced="^2">
+ <unit bldFile="upnpframework/upnpcommand/group"/>
+ </component>
+ <component id="upnpframework_rom" filter="s60" name="UPnP Framework ROM" introduced="^2">
+ <unit bldFile="upnpframework/rom"/>
+ </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">
+ <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="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="upnpgsplugin" filter="s60" name="UPnP GS Plugin" class="plugin" introduced="^2">
+ <meta rel="config">
+ <defined condition="FF_UPNP_FRAMEWORK_2_0"/>
+ </meta>
+ <unit bldFile="upnpsettings/upnpgsplugin/group"/>
+ </component>
+ <component id="upnpsettings_rom" filter="s60" name="UPnP Settings ROM" introduced="^2">
+ <unit bldFile="upnpsettings/rom"/>
+ </component>
+ </collection>
+ <!-- this collection was deleted a while back, but the tests are still #included from elsewhere.
+ If they're coming back, uncomment out this part, otherwise just delete this whole collection
+ <collection id="upnpstack" name="UPnP Stack" level="framework">
<component id="upnputils" filter="s60" name="UPnP Utils">
- <unit bldFile="upnpstack/upnputils/group"/>
- </component>
- <component id="upnpconnectionmanagersession" filter="s60" name="UPnP Connection Manager Session">
- <unit bldFile="upnpstack/upnpconnectionmanagersession/group"/>
- </component>
- <component id="upnpconnmanager" filter="s60" name="UPnP Connection Manager">
- <unit bldFile="upnpstack/upnpconnmanager/group"/>
- </component>
- <component id="dlnawebserver" filter="s60" name="DLNA Web Server">
- <unit bldFile="upnpstack/dlnawebserver/group"/>
+ <unit bldFile="upnpstack/upnputils/tsrc/public/basic/group" filter="test,api_test"/>
</component>
<component id="serviceframework" filter="s60" name="Service Framework">
- <unit bldFile="upnpstack/serviceframework/group"/>
- </component>
- <component id="ssdpserver" filter="s60" name="SSDP Server">
- <unit bldFile="upnpstack/ssdpserver/group"/>
- </component>
- <component id="messagehandler" filter="s60" name="Message Handler">
- <unit bldFile="upnpstack/messagehandler/group"/>
+ <unit bldFile="upnpstack/serviceframework/tsrc/public/basic/group" filter="test,api_test"/>
+ <unit bldFile="upnpstack/serviceframework/tsrc/private/configtester/group" filter="test,api_test"/>
</component>
<component id="controlpointbase" filter="s60" name="Control Point Base">
- <unit bldFile="upnpstack/controlpointbase/group"/>
- </component>
- <component id="upnphttptransfer" filter="s60" name="UPnP HTTP Transfer">
- <unit bldFile="upnpstack/upnphttptransfer/group"/>
- </component>
- <component id="upnpstack_build" filter="s60" name="UPnP Stack Build">
- <!-- consider moving content into above components -->
- <unit bldFile="upnpstack/group"/>
- </component>
- </collection>
- <collection id="upnpsharing" name="UPnP Sharing" level="server">
- <component id="upnpdlnaprofiler" filter="s60" name="UPnP DLNA Profiler" introduced="^2">
- <unit bldFile="upnpsharing/upnpdlnaprofiler/group"/>
- </component>
- <component id="upnpsecurity" filter="s60" name="UPnP Security" introduced="^2">
- <unit bldFile="upnpsharing/upnpsecurity/group"/>
- </component>
- <component id="upnpcontentserver" filter="s60" name="UPnP Content Server" introduced="^2">
- <unit bldFile="upnpsharing/upnpcontentserver/group"/>
- </component>
- <component id="applicationengine" filter="s60" name="UPnP Application Engine" introduced="^2">
- <unit bldFile="upnpsharing/applicationengine/group"/>
- </component>
- <component id="upnpsharing_build" filter="s60" name="UPnP Sharing Build" introduced="^2">
- <!-- consider moving content into above components -->
- <unit bldFile="upnpsharing/group"/>
+ <unit bldFile="upnpstack/controlpointbase/tsrc/public/basic/group" filter="test,api_test"/>
</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 -->
- <unit bldFile="upnpmpxplugins/group"/>
- </component>
- </collection>
- <collection id="upnpharvester" name="UPnP Harvester" level="ctrl">
- <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"/>
+ </collection> -->
+ <collection id="upnpsharing" name="UPnP Sharing" level="server">
+ <component id="upnpdlnaprofiler" filter="s60" name="UPnP DLNA Profiler" introduced="^2">
+ <unit bldFile="upnpsharing/upnpdlnaprofiler/group"/>
+ </component>
+ <component id="upnpsecurity" filter="s60" name="UPnP Security" introduced="^2">
+ <unit bldFile="upnpsharing/upnpsecurity/group"/>
+ </component>
+ <component id="upnpcontentserver" filter="s60" name="UPnP Content Server" introduced="^2">
+ <unit bldFile="upnpsharing/upnpcontentserver/group"/>
+ </component>
+ <component id="applicationengine" filter="s60" name="UPnP Application Engine" introduced="^2">
+ <unit bldFile="upnpsharing/applicationengine/group"/>
+ </component>
+ <component id="upnpsharing_rom" filter="s60" name="UPnP Sharing ROM" introduced="^2">
+ <unit bldFile="upnpsharing/rom"/>
+ </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_rom" filter="s60" name="UPnP MPX Plugins ROM" introduced="^2">
+ <unit bldFile="upnpmpxplugins/rom"/>
+ </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"/>
<unit bldFile="upnpharvester/common/cmsettings/group"/>
<unit bldFile="upnpharvester/common/cmsqlwrapper/group"/>
<unit bldFile="upnpharvester/common/dbmanager/group"/>
- </component>
- <component id="cdssync" filter="s60" name="CDS Sync" introduced="^2" deprecated="^3">
- <unit bldFile="upnpharvester/cdssync/common"/>
- </component>
- <component id="mdhserver" filter="s60" name="Metadata Harvester Server" introduced="^2" deprecated="^3">
- <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 -->
- <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">
- <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"/>
- </component>
- </collection>
- <collection id="homemedia" name="Home Media" level="framework">
- <component id="homemedia_build" filter="s60" name="Home Media" introduced="^2" deprecated="^3">
- <unit bldFile="homemedia/group"/>
- </component>
- </collection>
- <collection id="dlnasrv_info" name="DLNA Services Info" level="plugin">
- <component id="dlnasrv_plat" filter="s60" name="DLNA Services Platform Interfaces" class="api">
- <unit bldFile="dlnasrv_plat/group"/>
- </component>
- <component id="dlnasrv_build" filter="s60" name="DLNA Services Build">
- <unit bldFile="group"/>
- </component>
- </collection>
- </package>
+ </component>
+ <component id="cdssync" filter="s60" name="CDS Sync" introduced="^2" deprecated="^3">
+ <unit bldFile="upnpharvester/cdssync/common"/>
+ </component>
+ <component id="mdhserver" filter="s60" name="Metadata Harvester Server" introduced="^2" deprecated="^3">
+ <unit bldFile="upnpharvester/mdhserver/group"/>
+ </component>
+ <component id="upnpharvester_rom" filter="s60" name="UPnP Harvester ROM" introduced="^2" deprecated="^3">
+ <unit bldFile="upnpharvester/rom"/>
+ </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">
+ <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>
+ </collection>
+ </package>
</SystemDefinition>