--- a/symbian3/app/videoplayer/package_definition.xml Thu Mar 11 10:32:52 2010 +0000
+++ b/symbian3/app/videoplayer/package_definition.xml Wed Mar 17 14:41:09 2010 +0000
@@ -77,6 +77,19 @@
<systemModel>
<layer name="app" long-name="Applications" levels="services apps">
<block name="videoplayer" level="apps" long-name="Video Player Apps" levels="support plugin util apps">
+ <collection name="videoplayer_plat" long-name="Video Player Apps Platform Interfaces" level="apps">
+ <component name="videoplayer_startup_api" long-name="Video Player Startup API" filter="s60" class="api">
+ <unit bldFile="/sf/app/videoplayer/videoplayer_plat/videoplayer_startup_api/group" filter="!test"/>
+ <unit bldFile="/sf/app/videoplayer/videoplayer_plat/videoplayer_startup_api/tsrc/group" filter="test,api_test"/>
+ </component>
+ <component name="video_player_file_details_dialog_api" long-name="Media Player File Details Dialog API" filter="s60" class="api">
+ <unit bldFile="/sf/app/videoplayer/videoplayer_plat/video_player_file_details_dialog_api/group" filter="!test"/>
+ <unit bldFile="/sf/app/videoplayer/videoplayer_plat/video_player_file_details_dialog_api/tsrc/group" filter="test,api_test"/>
+ </component>
+ <component name="videocollection_api" long-name="Video Collection API" filter="s60" class="api">
+ <unit bldFile="/sf/app/videoplayer/videoplayer_plat/videocollection_api/group"/>
+ </component>
+ </collection>
<collection name="videofeeds" long-name="Video Feeds" level="util">
<component name="iptv_utils" filter="s60" long-name="IPTV Util" introduced="^3">
<unit bldFile="/sf/app/videoplayer/videofeeds/utils/group"/>
@@ -207,7 +220,8 @@
<unit bldFile="/sf/app/videoplayer/videoplayerapp/lwplayer/group"/>
</component>
<component name="mpxvideoplayer" filter="s60" long-name="MPX Video Player" plugin="Y">
- <unit bldFile="/sf/app/videoplayer/videoplayerapp/mpxvideoplayer/group"/>
+ <unit bldFile="/sf/app/videoplayer/videoplayerapp/mpxvideoplayer/group" filter="!test"/>
+ <unit bldFile="/sf/app/videoplayer/videoplayerapp/mpxvideoplayer/tsrc/ut_mpxvideoplayertest/group" filter="test,unit_test"/>
</component>
<component name="videoplayerlauncher" filter="s60" long-name="Video Player Launcher">
<unit bldFile="/sf/app/videoplayer/videoplayerapp/videoplayerlauncher/group"/>
@@ -215,36 +229,22 @@
</collection>
<collection name="videoplayback" long-name="Video Playback Plugins" level="plugin">
<component name="videohelix" long-name="Video Helix" filter="s60" introduced="^3" plugin="Y">
- <unit bldFile="/sf/app/videoplayer/videoplayback/videohelix/group"/>
+ <unit bldFile="/sf/app/videoplayer/videoplayback/videohelix/group" filter="!test"/>
+ <unit bldFile="/sf/app/videoplayer/videoplayback/videohelix/tsrc/ut_videohelixtest/group" filter="test,unit_test"/>
</component>
<component name="videopdlplaybackviewplugin" filter="s60" long-name="Video PDL Playback View Plugin" introduced="^3" plugin="Y">
- <unit bldFile="/sf/app/videoplayer/videoplayback/videopdlplaybackviewplugin/group"/>
+ <unit bldFile="/sf/app/videoplayer/videoplayback/videopdlplaybackviewplugin/group" filter="!test"/>
</component>
<component name="videoplaybackcontrols" filter="s60" long-name="Video Playback Controls" introduced="^3" plugin="Y">
- <unit bldFile="/sf/app/videoplayer/videoplayback/videoplaybackcontrols/group"/>
+ <unit bldFile="/sf/app/videoplayer/videoplayback/videoplaybackcontrols/group" filter="!test"/>
+ <unit bldFile="/sf/app/videoplayer/videoplayback/videoplaybackcontrols/tsrc/videoplaybackcontrols_test/group" filter="test,unit_test"/>
</component>
<component name="videoplaybackviewplugin" filter="s60" long-name="Video Playback View Plugin" introduced="^3" plugin="Y">
<unit bldFile="/sf/app/videoplayer/videoplayback/videoplaybackviewplugin/group"/>
</component>
<component name="videoplaybackviews" filter="s60" long-name="Video Playback Views" introduced="^3" plugin="Y">
- <unit bldFile="/sf/app/videoplayer/videoplayback/videoplaybackviews/group"/>
- </component>
- <component name="videoplayer_tsrc" long-name="Video Player Tests" filter="s60,test,unit_test" introduced="^3" purpose="development">
- <!-- can only have one unit. Can these be #included from any of the above. Why is a videoplayerapp test in here?-->
- <unit bldFile="/sf/app/videoplayer/videoplayback/videohelix/tsrc/ut_videohelixtest/group"/>
- <unit bldFile="/sf/app/videoplayer/videoplayback/videoplaybackcontrols/tsrc/videoplaybackcontrols_test/group"/>
- <unit bldFile="/sf/app/videoplayer/videoplayback/videoplaybackviews/tsrc/ut_userinputhandlertest/group"/>
- <unit bldFile="/sf/app/videoplayer/videoplayerapp/mpxvideoplayer/tsrc/ut_mpxvideoplayertest/group"/>
- </component>
- </collection>
- <collection name="videoplayer_info" long-name="Video Player Apps Info" level="apps">
- <component name="videoplayer_plat" filter="s60" long-name="Video Player Apps Platform Interfaces" class="api">
- <unit bldFile="/sf/app/videoplayer/videoplayer_plat/group"/>
- </component>
- <component name="videoplayer_api_test" filter="s60,test,api_test" purpose="development" long-name="Video Player API Test">
- <!-- can only have one unit, #include from a common bld.inf? -->
- <unit bldFile="/sf/app/videoplayer/videoplayer_plat/video_player_file_details_dialog_api/tsrc/group"/>
- <unit bldFile="/sf/app/videoplayer/videoplayer_plat/videoplayer_startup_api/tsrc/group"/>
+ <unit bldFile="/sf/app/videoplayer/videoplayback/videoplaybackviews/group" filter="!test"/>
+ <unit bldFile="/sf/app/videoplayer/videoplayback/videoplaybackviews/tsrc/ut_userinputhandlertest/group" filter="test,unit_test"/>
</component>
</collection>
</block>