Work done to be compliant with the new Guidelines for packate test organisation (http://developer.symbian.org/wiki/index.php/Guidelines_for_Package_Test_Organisation).
--- a/layers.sysdef.xml Mon Jun 21 15:37:19 2010 +0300
+++ b/layers.sysdef.xml Wed Oct 06 23:01:25 2010 +0100
@@ -1,5 +1,5 @@
<?xml version="1.0"?>
-<!DOCTYPE SystemDefinition SYSTEM "sysdef_1_4_0.dtd" [
+<!DOCTYPE SystemDefinition [
<!ENTITY layer_real_source_path "sf/app/musicplayer" >
]>
@@ -18,12 +18,6 @@
</module>
</layer>
- <layer name="pref_test_layer">
- <module name="musicplayer_tsrc_group">
- <unit unitID="musicplayer_tsrc_group" name="musicplayer_tsrc_group" bldFile="&layer_real_source_path;/tsrc/group" mrp="" filter="TA_MUSICPLAYER" />
- </module>
- </layer>
-
<layer name="app_musicplayer_layer">
<module name="musicplayer_group">
<unit unitID="musicplayer_group" mrp="" bldFile="&layer_real_source_path;/group" name="musicplayer_group" />
--- a/mpxmusicplayer/sis/build-sisx.bat Mon Jun 21 15:37:19 2010 +0300
+++ b/mpxmusicplayer/sis/build-sisx.bat Wed Oct 06 23:01:25 2010 +0100
@@ -15,4 +15,4 @@
rem
makesis -v mpxmusicplayer.pkg
-signsis mpxmusicplayer.sis mpxmusicplayer_0x101FFC62_v15.0.0911_SA_S60.50_Eng.sis Nokia_RnDCert_02.der Nokia_RnDCert_02.key
\ No newline at end of file
+signsis mpxmusicplayer.sis mpxmusicplayer_0x101FFC62_v15.0.0911_SA_S60.50_Eng.sis Nokia_RnDCert_02.der Nokia_RnDCert_02.key
--- a/mpxmusicplayer/sis/hgmpxcollectionview.pkg Mon Jun 21 15:37:19 2010 +0300
+++ b/mpxmusicplayer/sis/hgmpxcollectionview.pkg Wed Oct 06 23:01:25 2010 +0100
@@ -24,71 +24,71 @@
; VIEWS
;common container
-"\epoc32\release\armv5\udeb\mpxcommoncontainer.dll" -"c:\sys\bin\mpxcommoncontainer.dll"
+"\epoc32\release\$(platform)\$(target)\mpxcommoncontainer.dll" -"c:\sys\bin\mpxcommoncontainer.dll"
"\epoc32\data\Z\resource\apps\mpxcommoncontainer.rsc" -"c:\resource\apps\mpxcommoncontainer.rsc"
;collection
-"\epoc32\release\armv5\udeb\mpxcollectionview.dll" -"c:\sys\bin\mpxcollectionview.dll"
+"\epoc32\release\$(platform)\$(target)\mpxcollectionview.dll" -"c:\sys\bin\mpxcollectionview.dll"
"\epoc32\data\Z\resource\apps\mpxcollectionview.mif" -"c:\resource\apps\mpxcollectionview.mif"
"\epoc32\data\Z\resource\apps\mpxcollectionview.rsc" -"c:\resource\apps\mpxcollectionview.rsc"
;podcast
-"\epoc32\release\armv5\udeb\mpxpodcastcollectionview.dll" -"c:\sys\bin\mpxpodcastcollectionview.dll"
+"\epoc32\release\$(platform)\$(target)\mpxpodcastcollectionview.dll" -"c:\sys\bin\mpxpodcastcollectionview.dll"
"\epoc32\data\Z\resource\apps\mpxpodcastcollectionview.mif" -"c:\resource\apps\mpxpodcastcollectionview.mif"
"\epoc32\data\Z\resource\apps\mpxpodcastcollectionview.rsc" -"c:\resource\apps\mpxpodcastcollectionview.rsc"
;albumeditdialog TNM integration
-"\epoc32\release\armv5\UDEB\mpxalbumarteditordialog.dll" -"c:\sys\bin\mpxalbumarteditordialog.dll"
+"\epoc32\release\$(platform)\$(target)\mpxalbumarteditordialog.dll" -"c:\sys\bin\mpxalbumarteditordialog.dll"
"\epoc32\data\Z\resource\apps\mpxalbumarteditordialog.rsc" -"c:\resource\apps\mpxalbumarteditordialog.rsc"
-"\epoc32\release\armv5\UDEB\mpxcollectionviewplugin.dll" -"c:\sys\bin\mpxcollectionviewplugin.dll"
+"\epoc32\release\$(platform)\$(target)\mpxcollectionviewplugin.dll" -"c:\sys\bin\mpxcollectionviewplugin.dll"
"\epoc32\data\Z\resource\plugins\mpxcollectionviewplugin.rsc" -"c:\resource\plugins\mpxcollectionviewplugin.rsc"
;Service Plugins: DB changes
;mpxsqlitedbcommon
-"\epoc32\release\armv5\udeb\mpxsqlitedbcommon.dll" -"c:\sys\bin\mpxsqlitedbcommon.dll"
+"\epoc32\release\$(platform)\$(target)\mpxsqlitedbcommon.dll" -"c:\sys\bin\mpxsqlitedbcommon.dll"
;mpxsqlitedbplugin
-"\epoc32\release\armv5\udeb\mpxsqlitedbplugin.dll" -"c:\sys\bin\mpxsqlitedbplugin.dll"
+"\epoc32\release\$(platform)\$(target)\mpxsqlitedbplugin.dll" -"c:\sys\bin\mpxsqlitedbplugin.dll"
"\epoc32\data\Z\resource\plugins\mpxsqlitedbplugin.rsc" -"c:\resource\plugins\mpxsqlitedbplugin.rsc"
"\epoc32\data\Z\resource\apps\mpxcollectiondbres.rsc" -"c:\resource\apps\mpxcollectiondbres.rsc"
"\epoc32\data\Z\resource\apps\pcres.rsc" -"c:\resource\apps\pcres.rsc"
;podcast db plugin
-"\epoc32\release\armv5\udeb\mpxsqlitepodcastdbplugin.dll" -"c:\sys\bin\mpxsqlitepodcastdbplugin.dll"
+"\epoc32\release\$(platform)\$(target)\mpxsqlitepodcastdbplugin.dll" -"c:\sys\bin\mpxsqlitepodcastdbplugin.dll"
"\epoc32\data\Z\resource\plugins\mpxsqlitepodcastdbplugin.rsc" -"c:\resource\plugins\mpxsqlitepodcastdbplugin.rsc"
;mpx frameworks:
; From Common Framework
-"\epoc32\release\armv5\UREL\mpxcommon.dll" -"c:\sys\bin\mpxcommon.dll"
+"\epoc32\release\$(platform)\$(target)\mpxcommon.dll" -"c:\sys\bin\mpxcommon.dll"
; From Collection Framework
-"\epoc32\release\armv5\UREL\mpxcollectionutility.dll" -"c:\sys\bin\mpxcollectionutility.dll"
-"\epoc32\release\armv5\UREL\mpxcollectionserver.exe" -"c:\sys\bin\mpxcollectionserver.exe"
-"\epoc32\release\armv5\UREL\mpxcollectionengine.dll" -"c:\sys\bin\mpxcollectionengine.dll"
+"\epoc32\release\$(platform)\$(target)\mpxcollectionutility.dll" -"c:\sys\bin\mpxcollectionutility.dll"
+"\epoc32\release\$(platform)\$(target)\mpxcollectionserver.exe" -"c:\sys\bin\mpxcollectionserver.exe"
+"\epoc32\release\$(platform)\$(target)\mpxcollectionengine.dll" -"c:\sys\bin\mpxcollectionengine.dll"
; From Playback Framework
-"\epoc32\release\armv5\UREL\mpxplaybackengine.dll" -"c:\sys\bin\mpxplaybackengine.dll"
-"\epoc32\release\armv5\UREL\mpxplaybackserver.exe" -"c:\sys\bin\mpxplaybackserver.exe"
-"\epoc32\release\armv5\UREL\mpxplaybackutility.dll" -"c:\sys\bin\mpxplaybackutility.dll"
+"\epoc32\release\$(platform)\$(target)\mpxplaybackengine.dll" -"c:\sys\bin\mpxplaybackengine.dll"
+"\epoc32\release\$(platform)\$(target)\mpxplaybackserver.exe" -"c:\sys\bin\mpxplaybackserver.exe"
+"\epoc32\release\$(platform)\$(target)\mpxplaybackutility.dll" -"c:\sys\bin\mpxplaybackutility.dll"
; From Harvester
-"\epoc32\release\armv5\UREL\mpxharvesterserver.exe" -"c:\sys\bin\mpxharvesterserver.exe"
-"\epoc32\release\armv5\UREL\mpxfilehandler.dll" -"c:\sys\bin\mpxfilehandler.dll"
-"\epoc32\release\armv5\UREL\mpxharvesterutility.dll" -"c:\sys\bin\mpxharvesterutility.dll"
-"\epoc32\release\armv5\UREL\mpxcollectionmediator.dll" -"c:\sys\bin\mpxcollectionmediator.dll"
-"\epoc32\release\armv5\UREL\mpxmetadataextractor.dll" -"c:\sys\bin\mpxmetadataextractor.dll"
+"\epoc32\release\$(platform)\$(target)\mpxharvesterserver.exe" -"c:\sys\bin\mpxharvesterserver.exe"
+"\epoc32\release\$(platform)\$(target)\mpxfilehandler.dll" -"c:\sys\bin\mpxfilehandler.dll"
+"\epoc32\release\$(platform)\$(target)\mpxharvesterutility.dll" -"c:\sys\bin\mpxharvesterutility.dll"
+"\epoc32\release\$(platform)\$(target)\mpxcollectionmediator.dll" -"c:\sys\bin\mpxcollectionmediator.dll"
+"\epoc32\release\$(platform)\$(target)\mpxmetadataextractor.dll" -"c:\sys\bin\mpxmetadataextractor.dll"
"\epoc32\data\Z\resource\apps\mpxmediator.rsc" -"c:\resource\apps\mpxmediator.rsc"
; From Playlist Engine
-"\epoc32\release\armv5\UREL\mpxplaylistengine.dll" -"c:\sys\bin\mpxplaylistengine.dll"
-"\epoc32\release\armv5\UREL\mpxplaylistrecognizer.dll" -"c:\sys\bin\mpxplaylistrecognizer.dll"
+"\epoc32\release\$(platform)\$(target)\mpxplaylistengine.dll" -"c:\sys\bin\mpxplaylistengine.dll"
+"\epoc32\release\$(platform)\$(target)\mpxplaylistrecognizer.dll" -"c:\sys\bin\mpxplaylistrecognizer.dll"
"\epoc32\data\Z\resource\plugins\mpxplaylistrecognizer.rsc" -"c:\resource\plugins\mpxplaylistrecognizer.rsc"
"\epoc32\data\Z\resource\mpxplaylisttopcharacterset.rsc" -"c:\resource\mpxplaylisttopcharacterset.rsc"
; From View Framework
-"\epoc32\release\armv5\UREL\mpxviewutility.dll" -"c:\sys\bin\mpxviewutility.dll"
-"\epoc32\release\armv5\UREL\mpxviewplugin.dll" -"c:\sys\bin\mpxviewplugin.dll"
+"\epoc32\release\$(platform)\$(target)\mpxviewutility.dll" -"c:\sys\bin\mpxviewutility.dll"
+"\epoc32\release\$(platform)\$(target)\mpxviewplugin.dll" -"c:\sys\bin\mpxviewplugin.dll"
; Other pieces
-"\epoc32\release\armv5\UREL\mpxalbumartutility.dll" -"c:\sys\bin\mpxalbumartutility.dll"
-"\epoc32\release\armv5\UREL\mpxcollectionhelper.dll" -"c:\sys\bin\mpxcollectionhelper.dll"
+"\epoc32\release\$(platform)\$(target)\mpxalbumartutility.dll" -"c:\sys\bin\mpxalbumartutility.dll"
+"\epoc32\release\$(platform)\$(target)\mpxcollectionhelper.dll" -"c:\sys\bin\mpxcollectionhelper.dll"
; Add missing dll files
-"\epoc32\release\armv5\UREL\MPSettEngine.dll" -"!:\sys\bin\MPSettEngine.dll"
+"\epoc32\release\$(platform)\$(target)\mpsettengine.dll" -"!:\sys\bin\mpsettengine.dll"
--- a/mpxmusicplayer/sis/mpxmusicplayer.pkg Mon Jun 21 15:37:19 2010 +0300
+++ b/mpxmusicplayer/sis/mpxmusicplayer.pkg Wed Oct 06 23:01:25 2010 +0100
@@ -61,76 +61,76 @@
;Files to install
-"\epoc32\release\armv5\urel\mpxcommonui.dll" -"!:\sys\bin\mpxcommonui.dll"
-"\epoc32\release\armv5\urel\mpxmediakeyhandler.dll" -"!:\sys\bin\mpxmediakeyhandler.dll"
-"\epoc32\release\armv5\urel\mpxsqlitedbcommon.dll" -"!:\sys\bin\mpxsqlitedbcommon.dll"
-"\epoc32\release\armv5\urel\mpxsqlitedbplugin.dll" -"!:\sys\bin\mpxsqlitedbplugin.dll"
-"\epoc32\release\armv5\urel\mpxsqlitepodcastdbplugin.dll" -"!:\sys\bin\mpxsqlitepodcastdbplugin.dll"
-"\epoc32\release\armv5\urel\mpxinmemoryplugin.dll" -"!:\sys\bin\mpxinmemoryplugin.dll"
-"\epoc32\release\armv5\urel\mpxlocalaudioplayback.dll" -"!:\sys\bin\mpxlocalaudioplayback.dll"
-"\epoc32\release\armv5\urel\mpxaudioeffectengine.dll" -"!:\sys\bin\mpxaudioeffectengine.dll"
-"\epoc32\release\armv5\urel\mpxm3uplaylistparsers.dll" -"!:\sys\bin\mpxm3uplaylistparsers.dll"
-"\epoc32\release\armv5\urel\mpxm3uplaylistplugin.dll" -"!:\sys\bin\mpxm3uplaylistplugin.dll"
-"\epoc32\release\armv5\urel\mpxscreensaverplugin.dll" -"!:\sys\bin\mpxscreensaverplugin.dll"
-"\epoc32\release\armv5\urel\mpxvisualizationplugins.dll" -"!:\sys\bin\mpxvisualizationplugins.dll"
-"\epoc32\release\armv5\urel\mpxmainviewplugin.dll" -"!:\sys\bin\mpxmainviewplugin.dll"
-"\epoc32\release\armv5\urel\mpxplaybackviewplugin.dll" -"!:\sys\bin\mpxplaybackviewplugin.dll"
-"\epoc32\release\armv5\urel\mpxpodcastplaybackviewplugin.dll" -"!:\sys\bin\mpxpodcastplaybackviewplugin.dll"
-"\epoc32\release\armv5\urel\mpxembeddedplaybackviewplugin.dll" -"!:\sys\bin\mpxembeddedplaybackviewplugin.dll"
-"\epoc32\release\armv5\urel\mpxpdplaybackviewplugin.dll" -"!:\sys\bin\mpxpdplaybackviewplugin.dll"
-"\epoc32\release\armv5\urel\mpxcollectionviewplugin.dll" -"!:\sys\bin\mpxcollectionviewplugin.dll"
-"\epoc32\release\armv5\urel\mpxequalizerviewplugin.dll" -"!:\sys\bin\mpxequalizerviewplugin.dll"
-"\epoc32\release\armv5\urel\mpxaudioeffectsviewplugin.dll" -"!:\sys\bin\mpxaudioeffectsviewplugin.dll"
-"\epoc32\release\armv5\urel\mpxwaitnotedialogplugin.dll" -"!:\sys\bin\mpxwaitnotedialogplugin.dll"
-"\epoc32\release\armv5\urel\mpxmetadataeditordialogplugin.dll" -"!:\sys\bin\mpxmetadataeditordialogplugin.dll"
-"\epoc32\release\armv5\urel\mpxalbumarteditordialogplugin.dll" -"!:\sys\bin\mpxalbumarteditordialogplugin.dll"
-"\epoc32\release\armv5\urel\mpxaddtracksdialogplugin.dll" -"!:\sys\bin\mpxaddtracksdialogplugin.dll"
-"\epoc32\release\armv5\urel\mpxvisualizationviewplugin.dll" -"!:\sys\bin\mpxvisualizationviewplugin.dll"
-"\epoc32\release\armv5\urel\mpxvisualizationmenudialogplugin.dll" -"!:\sys\bin\mpxvisualizationmenudialogplugin.dll"
+"\epoc32\release\$(platform)\$(target)\mpxcommonui.dll" -"!:\sys\bin\mpxcommonui.dll"
+"\epoc32\release\$(platform)\$(target)\mpxmediakeyhandler.dll" -"!:\sys\bin\mpxmediakeyhandler.dll"
+"\epoc32\release\$(platform)\$(target)\mpxsqlitedbcommon.dll" -"!:\sys\bin\mpxsqlitedbcommon.dll"
+"\epoc32\release\$(platform)\$(target)\mpxsqlitedbplugin.dll" -"!:\sys\bin\mpxsqlitedbplugin.dll"
+"\epoc32\release\$(platform)\$(target)\mpxsqlitepodcastdbplugin.dll" -"!:\sys\bin\mpxsqlitepodcastdbplugin.dll"
+"\epoc32\release\$(platform)\$(target)\mpxinmemoryplugin.dll" -"!:\sys\bin\mpxinmemoryplugin.dll"
+"\epoc32\release\$(platform)\$(target)\mpxlocalaudioplayback.dll" -"!:\sys\bin\mpxlocalaudioplayback.dll"
+"\epoc32\release\$(platform)\$(target)\mpxaudioeffectengine.dll" -"!:\sys\bin\mpxaudioeffectengine.dll"
+"\epoc32\release\$(platform)\$(target)\mpxm3uplaylistparsers.dll" -"!:\sys\bin\mpxm3uplaylistparsers.dll"
+"\epoc32\release\$(platform)\$(target)\mpxm3uplaylistplugin.dll" -"!:\sys\bin\mpxm3uplaylistplugin.dll"
+"\epoc32\release\$(platform)\$(target)\mpxscreensaverplugin.dll" -"!:\sys\bin\mpxscreensaverplugin.dll"
+"\epoc32\release\$(platform)\$(target)\mpxvisualizationplugins.dll" -"!:\sys\bin\mpxvisualizationplugins.dll"
+"\epoc32\release\$(platform)\$(target)\mpxmainviewplugin.dll" -"!:\sys\bin\mpxmainviewplugin.dll"
+"\epoc32\release\$(platform)\$(target)\mpxplaybackviewplugin.dll" -"!:\sys\bin\mpxplaybackviewplugin.dll"
+"\epoc32\release\$(platform)\$(target)\mpxpodcastplaybackviewplugin.dll" -"!:\sys\bin\mpxpodcastplaybackviewplugin.dll"
+"\epoc32\release\$(platform)\$(target)\mpxembeddedplaybackviewplugin.dll" -"!:\sys\bin\mpxembeddedplaybackviewplugin.dll"
+"\epoc32\release\$(platform)\$(target)\mpxpdplaybackviewplugin.dll" -"!:\sys\bin\mpxpdplaybackviewplugin.dll"
+"\epoc32\release\$(platform)\$(target)\mpxcollectionviewplugin.dll" -"!:\sys\bin\mpxcollectionviewplugin.dll"
+"\epoc32\release\$(platform)\$(target)\mpxequalizerviewplugin.dll" -"!:\sys\bin\mpxequalizerviewplugin.dll"
+"\epoc32\release\$(platform)\$(target)\mpxaudioeffectsviewplugin.dll" -"!:\sys\bin\mpxaudioeffectsviewplugin.dll"
+"\epoc32\release\$(platform)\$(target)\mpxwaitnotedialogplugin.dll" -"!:\sys\bin\mpxwaitnotedialogplugin.dll"
+"\epoc32\release\$(platform)\$(target)\mpxmetadataeditordialogplugin.dll" -"!:\sys\bin\mpxmetadataeditordialogplugin.dll"
+"\epoc32\release\$(platform)\$(target)\mpxalbumarteditordialogplugin.dll" -"!:\sys\bin\mpxalbumarteditordialogplugin.dll"
+"\epoc32\release\$(platform)\$(target)\mpxaddtracksdialogplugin.dll" -"!:\sys\bin\mpxaddtracksdialogplugin.dll"
+"\epoc32\release\$(platform)\$(target)\mpxvisualizationviewplugin.dll" -"!:\sys\bin\mpxvisualizationviewplugin.dll"
+"\epoc32\release\$(platform)\$(target)\mpxvisualizationmenudialogplugin.dll" -"!:\sys\bin\mpxvisualizationmenudialogplugin.dll"
-"\epoc32\release\armv5\urel\mpxupnpplaybackviewplugin.dll" -"!:\sys\bin\mpxupnpplaybackviewplugin.dll"
-"\epoc32\release\armv5\urel\mpxupnpbrowsedialogplugin.dll" -"!:\sys\bin\mpxupnpbrowsedialogplugin.dll"
-"\epoc32\release\armv5\urel\mpxupnpplaybackdialogplugin.dll" -"!:\sys\bin\mpxupnpplaybackdialogplugin.dll"
-"\epoc32\release\armv5\urel\mpxupnpbrowsedialog.dll" -"!:\sys\bin\mpxupnpbrowsedialog.dll"
-"\epoc32\release\armv5\urel\mpxupnpplaybackview.dll" -"!:\sys\bin\mpxupnpplaybackview.dll"
-"\epoc32\release\armv5\urel\mpxupnpplaybackdialog.dll" -"!:\sys\bin\mpxupnpplaybackdialog.dll"
-"\epoc32\release\armv5\urel\mpxplaybackview.dll" -"!:\sys\bin\mpxplaybackview.dll"
-"\epoc32\release\armv5\urel\mpxpodcastplaybackview.dll" -"!:\sys\bin\mpxpodcastplaybackview.dll"
-"\epoc32\release\armv5\urel\mpxaddtracksdialog.dll" -"!:\sys\bin\mpxaddtracksdialog.dll"
-"\epoc32\release\armv5\urel\mpxalbumarteditordialog.dll" -"!:\sys\bin\mpxalbumarteditordialog.dll"
-"\epoc32\release\armv5\urel\mpxaudioeffectsview.dll" -"!:\sys\bin\mpxaudioeffectsview.dll"
-"\epoc32\release\armv5\urel\mpxcollectionview.dll" -"!:\sys\bin\mpxcollectionview.dll"
-"\epoc32\release\armv5\urel\mpxcommoncontainer.dll" -"!:\sys\bin\mpxcommoncontainer.dll"
-"\epoc32\release\armv5\urel\mpxcommonplaybackview.dll" -"!:\sys\bin\mpxcommonplaybackview.dll"
-"\epoc32\release\armv5\urel\mpxembeddedplaybackview.dll" -"!:\sys\bin\mpxembeddedplaybackview.dll"
-"\epoc32\release\armv5\urel\mpxequalizerview.dll" -"!:\sys\bin\mpxequalizerview.dll"
-"\epoc32\release\armv5\urel\mpxmainview.dll" -"!:\sys\bin\mpxmainview.dll"
-"\epoc32\release\armv5\urel\mpxmetadataeditordialog.dll" -"!:\sys\bin\mpxmetadataeditordialog.dll"
-"\epoc32\release\armv5\urel\mpxpdplaybackview.dll" -"!:\sys\bin\mpxpdplaybackview.dll"
-"\epoc32\release\armv5\urel\mpxwaitnotedialog.dll" -"!:\sys\bin\mpxwaitnotedialog.dll"
-"\epoc32\release\armv5\urel\mpxvisualizationmenudialog.dll" -"!:\sys\bin\mpxvisualizationmenudialog.dll"
-"\epoc32\release\armv5\urel\mpxvisualizationview.dll" -"!:\sys\bin\mpxvisualizationview.dll"
-"\epoc32\release\armv5\urel\aiplayerplugin2.dll" -"!:\sys\bin\aiplayerplugin2.dll"
-"\epoc32\release\armv5\urel\mpx.exe" -"!:\sys\bin\mpx.exe"
-"\epoc32\release\armv5\urel\MusicVisualizationPlugin.dll" -"!:\sys\bin\MusicVisualizationPlugin.dll"
+"\epoc32\release\$(platform)\$(target)\mpxupnpplaybackviewplugin.dll" -"!:\sys\bin\mpxupnpplaybackviewplugin.dll"
+"\epoc32\release\$(platform)\$(target)\mpxupnpbrowsedialogplugin.dll" -"!:\sys\bin\mpxupnpbrowsedialogplugin.dll"
+"\epoc32\release\$(platform)\$(target)\mpxupnpplaybackdialogplugin.dll" -"!:\sys\bin\mpxupnpplaybackdialogplugin.dll"
+"\epoc32\release\$(platform)\$(target)\mpxupnpbrowsedialog.dll" -"!:\sys\bin\mpxupnpbrowsedialog.dll"
+"\epoc32\release\$(platform)\$(target)\mpxupnpplaybackview.dll" -"!:\sys\bin\mpxupnpplaybackview.dll"
+"\epoc32\release\$(platform)\$(target)\mpxupnpplaybackdialog.dll" -"!:\sys\bin\mpxupnpplaybackdialog.dll"
+"\epoc32\release\$(platform)\$(target)\mpxplaybackview.dll" -"!:\sys\bin\mpxplaybackview.dll"
+"\epoc32\release\$(platform)\$(target)\mpxpodcastplaybackview.dll" -"!:\sys\bin\mpxpodcastplaybackview.dll"
+"\epoc32\release\$(platform)\$(target)\mpxaddtracksdialog.dll" -"!:\sys\bin\mpxaddtracksdialog.dll"
+"\epoc32\release\$(platform)\$(target)\mpxalbumarteditordialog.dll" -"!:\sys\bin\mpxalbumarteditordialog.dll"
+"\epoc32\release\$(platform)\$(target)\mpxaudioeffectsview.dll" -"!:\sys\bin\mpxaudioeffectsview.dll"
+"\epoc32\release\$(platform)\$(target)\mpxcollectionview.dll" -"!:\sys\bin\mpxcollectionview.dll"
+"\epoc32\release\$(platform)\$(target)\mpxcommoncontainer.dll" -"!:\sys\bin\mpxcommoncontainer.dll"
+"\epoc32\release\$(platform)\$(target)\mpxcommonplaybackview.dll" -"!:\sys\bin\mpxcommonplaybackview.dll"
+"\epoc32\release\$(platform)\$(target)\mpxembeddedplaybackview.dll" -"!:\sys\bin\mpxembeddedplaybackview.dll"
+"\epoc32\release\$(platform)\$(target)\mpxequalizerview.dll" -"!:\sys\bin\mpxequalizerview.dll"
+"\epoc32\release\$(platform)\$(target)\mpxmainview.dll" -"!:\sys\bin\mpxmainview.dll"
+"\epoc32\release\$(platform)\$(target)\mpxmetadataeditordialog.dll" -"!:\sys\bin\mpxmetadataeditordialog.dll"
+"\epoc32\release\$(platform)\$(target)\mpxpdplaybackview.dll" -"!:\sys\bin\mpxpdplaybackview.dll"
+"\epoc32\release\$(platform)\$(target)\mpxwaitnotedialog.dll" -"!:\sys\bin\mpxwaitnotedialog.dll"
+"\epoc32\release\$(platform)\$(target)\mpxvisualizationmenudialog.dll" -"!:\sys\bin\mpxvisualizationmenudialog.dll"
+"\epoc32\release\$(platform)\$(target)\mpxvisualizationview.dll" -"!:\sys\bin\mpxvisualizationview.dll"
+"\epoc32\release\$(platform)\$(target)\aiplayerplugin2.dll" -"!:\sys\bin\aiplayerplugin2.dll"
+"\epoc32\release\$(platform)\$(target)\mpx.exe" -"!:\sys\bin\mpx.exe"
+"\epoc32\release\$(platform)\$(target)\musicvisualizationplugin.dll" -"!:\sys\bin\musicvisualizationplugin.dll"
; Need these when we enable camese ui
-;"\epoc32\release\armv5\urel\camesebrowserview.dll" -"!:\sys\bin\camesebrowserview.dll"
-;"\epoc32\release\armv5\urel\camesebrowserviewplugin.dll" -"!:\sys\bin\camesebrowserviewplugin.dll"
-;"\epoc32\release\armv5\urel\cameseuicommon.dll" -"!:\sys\bin\cameseuicommon.dll"
-;"\epoc32\release\armv5\urel\camesedrmhandler.dll" -"!:\sys\bin\camesedrmhandler.dll"
+;"\epoc32\release\$(platform)\$(target)\camesebrowserview.dll" -"!:\sys\bin\camesebrowserview.dll"
+;"\epoc32\release\$(platform)\$(target)\camesebrowserviewplugin.dll" -"!:\sys\bin\camesebrowserviewplugin.dll"
+;"\epoc32\release\$(platform)\$(target)\cameseuicommon.dll" -"!:\sys\bin\cameseuicommon.dll"
+;"\epoc32\release\$(platform)\$(target)\camesedrmhandler.dll" -"!:\sys\bin\camesedrmhandler.dll"
-"\epoc32\release\armv5\urel\mcpmusicplayer.dll" -"!:\sys\bin\mcpmusicplayer.dll"
-"\epoc32\release\armv5\urel\musiccontentpublisher.dll" -"!:\sys\bin\musiccontentpublisher.dll"
-"\epoc32\release\armv5\urel\musicplayeractionhandlerplugin.dll" -"!:\sys\bin\musicplayeractionhandlerplugin.dll"
-"\epoc32\release\armv5\urel\dummyMusic.dll" -"!:\sys\bin\dummyMusic.dll"
-"\epoc32\release\armv5\urel\mpxprogressdownload.dll" -"!:\sys\bin\mpxprogressdownload.dll"
-"\epoc32\release\armv5\urel\mpxprogressdownloadsb.dll" -"!:\sys\bin\mpxprogressdownloadsb.dll"
-"\epoc32\release\armv5\urel\mpxpdsbplaybackviewplugin.dll" -"!:\sys\bin\mpxpdsbplaybackviewplugin.dll"
-"\epoc32\release\armv5\urel\mpxpdsbplaybackview.dll" -"!:\sys\bin\mpxpdsbplaybackview.dll"
-"\epoc32\release\armv5\urel\mpxpodcastcollectionview.dll" -"!:\sys\bin\mpxpodcastcollectionview.dll"
-"\epoc32\release\armv5\urel\mpxpodcastcollectionviewplugin.dll" -"!:\sys\bin\mpxpodcastcollectionviewplugin.dll"
-"\epoc32\release\armv5\urel\mpxmetadatahandler.dll" -"!:\sys\bin\mpxmetadatahandler.dll"
+"\epoc32\release\$(platform)\$(target)\mcpmusicplayer.dll" -"!:\sys\bin\mcpmusicplayer.dll"
+"\epoc32\release\$(platform)\$(target)\musiccontentpublisher.dll" -"!:\sys\bin\musiccontentpublisher.dll"
+"\epoc32\release\$(platform)\$(target)\musicplayeractionhandlerplugin.dll" -"!:\sys\bin\musicplayeractionhandlerplugin.dll"
+"\epoc32\release\$(platform)\$(target)\dummymusic.dll" -"!:\sys\bin\dummymusic.dll"
+"\epoc32\release\$(platform)\$(target)\mpxprogressdownload.dll" -"!:\sys\bin\mpxprogressdownload.dll"
+"\epoc32\release\$(platform)\$(target)\mpxprogressdownloadsb.dll" -"!:\sys\bin\mpxprogressdownloadsb.dll"
+"\epoc32\release\$(platform)\$(target)\mpxpdsbplaybackviewplugin.dll" -"!:\sys\bin\mpxpdsbplaybackviewplugin.dll"
+"\epoc32\release\$(platform)\$(target)\mpxpdsbplaybackview.dll" -"!:\sys\bin\mpxpdsbplaybackview.dll"
+"\epoc32\release\$(platform)\$(target)\mpxpodcastcollectionview.dll" -"!:\sys\bin\mpxpodcastcollectionview.dll"
+"\epoc32\release\$(platform)\$(target)\mpxpodcastcollectionviewplugin.dll" -"!:\sys\bin\mpxpodcastcollectionviewplugin.dll"
+"\epoc32\release\$(platform)\$(target)\mpxmetadatahandler.dll" -"!:\sys\bin\mpxmetadatahandler.dll"
"\epoc32\data\Z\private\102072C3\background_256x256.jpg" -"!:\private\102072C3\background_256x256.jpg"
"\epoc32\data\Z\private\102072C3\background_large.jpg" -"!:\private\102072C3\background_large.jpg"
--- a/musicplayer_plat/mpx_music_player_app_api/tsrc/init/TestFramework.ini Mon Jun 21 15:37:19 2010 +0300
+++ b/musicplayer_plat/mpx_music_player_app_api/tsrc/init/TestFramework.ini Wed Oct 06 23:01:25 2010 +0100
@@ -48,7 +48,7 @@
CreateTestReport= YES # Possible values: YES or NO
-UITestingSupport= YES
+#UITestingSupport= YES
TestReportFilePath= C:\LOGS\TestFramework\
TestReportFileName= TestReport_ui_mpxmusicplayertest
--- a/musicplayer_plat/mpx_music_player_app_api/tsrc/ui_mpxmusicplayertest/group/bld.inf Mon Jun 21 15:37:19 2010 +0300
+++ b/musicplayer_plat/mpx_music_player_app_api/tsrc/ui_mpxmusicplayertest/group/bld.inf Wed Oct 06 23:01:25 2010 +0100
@@ -25,6 +25,16 @@
// NOTE: If using ARS requirements all export operations should be done under this.
// 'abld test export'
+// To be used with emulator winscw
+..\..\data\mmc\mpxtest1.mp3 c:\testing\data\mpxtest1.mp3
+..\..\data\mmc\mpxtest2.mp3 c:\testing\data\mpxtest2.mp3
+..\..\data\mmc\mpxtestplaylist.m3u c:\testing\data\mpxtestplaylist.m3u
+..\..\init\TestFramework.ini c:\testframework\TestFramework.ini
+..\..\conf\ui_mpxmusicplayertest.cfg c:\testframework\ui_mpxmusicplayertest.cfg
+..\..\conf\tcMpxMusicPlayerTest.cfg c:\testframework\tcMpxMusicPlayerTest.cfg
+..\..\conf\tcmpxmusicplayertest.bat c:\testframework\tcmpxmusicplayertest.bat
+..\..\conf\ui_mpxmusicplayertest.bat c:\testframework\ui_mpxmusicplayertest.bat
+
PRJ_EXPORTS
PRJ_TESTMMPFILES
--- a/musicplayer_plat/mpx_music_player_app_api/tsrc/ui_mpxmusicplayertest/group/ui_mpxmusicplayertest.pkg Mon Jun 21 15:37:19 2010 +0300
+++ b/musicplayer_plat/mpx_music_player_app_api/tsrc/ui_mpxmusicplayertest/group/ui_mpxmusicplayertest.pkg Wed Oct 06 23:01:25 2010 +0100
@@ -52,7 +52,7 @@
"..\..\init\TestFramework.ini" - "c:\testframework\TestFramework.ini"
"..\..\conf\ui_mpxmusicplayertest.cfg" - "c:\testframework\ui_mpxmusicplayertest.cfg"
"..\..\conf\tcMpxMusicPlayerTest.cfg" - "c:\testframework\tcMpxMusicPlayerTest.cfg"
-"\epoc32\release\armv5\urel\ui_mpxmusicplayertest.dll" - "c:\Sys\Bin\ui_mpxmusicplayertest.dll"
+"\epoc32\release\$(platform)\$(target)\ui_mpxmusicplayertest.dll" - "c:\sys\bin\ui_mpxmusicplayertest.dll"
; Embedded SIS
; None
@@ -63,4 +63,4 @@
; None
; PKG capabilities
-; None
\ No newline at end of file
+; None
--- a/musicplayer_plat/mpx_music_player_commonui_api/tsrc/init/TestFramework.ini Mon Jun 21 15:37:19 2010 +0300
+++ b/musicplayer_plat/mpx_music_player_commonui_api/tsrc/init/TestFramework.ini Wed Oct 06 23:01:25 2010 +0100
@@ -48,7 +48,7 @@
CreateTestReport= YES # Possible values: YES or NO
-UITestingSupport= YES
+#UITestingSupport= YES
TestReportFilePath= C:\LOGS\TestFramework\
TestReportFileName= TestReport_ui_mpxmusicplayercommonuitest
--- a/musicplayer_plat/mpx_music_player_commonui_api/tsrc/ui_mpxmusicplayercommonuitest/group/bld.inf Mon Jun 21 15:37:19 2010 +0300
+++ b/musicplayer_plat/mpx_music_player_commonui_api/tsrc/ui_mpxmusicplayercommonuitest/group/bld.inf Wed Oct 06 23:01:25 2010 +0100
@@ -26,6 +26,13 @@
// NOTE: If using ARS requirements all export operations should be done under this.
// 'abld test export'
+// To be used with emulator winscw
+..\..\data\mmc\my.mbm c:\testing\data\my.mbm
+..\..\data\mmc\Waterlilies.jpg c:\testing\data\Waterlilies.jpg
+..\..\init\TestFramework.ini c:\testframework\TestFramework.ini
+..\..\conf\ui_mpxmusicplayercommonuitest.cfg c:\testframework\ui_mpxmusicplayercommonuitest.cfg
+..\..\conf\ui_mpxmusicplayercommonuitest.bat c:\testframework\ui_mpxmusicplayercommonuitest.bat
+
PRJ_EXPORTS
// Specify the source file followed by its destination here
// copy will be used to copy the source file to its destination
--- a/musicplayer_plat/mpx_music_player_commonui_api/tsrc/ui_mpxmusicplayercommonuitest/group/ui_mpxmusicplayercommonuitest.pkg Mon Jun 21 15:37:19 2010 +0300
+++ b/musicplayer_plat/mpx_music_player_commonui_api/tsrc/ui_mpxmusicplayercommonuitest/group/ui_mpxmusicplayercommonuitest.pkg Wed Oct 06 23:01:25 2010 +0100
@@ -52,7 +52,7 @@
"..\..\data\mmc\Waterlilies.jpg" - "e:\testing\data\Waterlilies.jpg"
"..\..\init\TestFramework.ini" - "c:\testframework\TestFramework.ini"
"..\..\conf\ui_mpxmusicplayercommonuitest.cfg" - "c:\testframework\ui_mpxmusicplayercommonuitest.cfg"
-"\epoc32\release\armv5\urel\ui_mpxmusicplayercommonuitest.dll" - "c:\Sys\Bin\ui_mpxmusicplayercommonuitest.dll"
+"\epoc32\release\$(platform)\$(target)\ui_mpxmusicplayercommonuitest.dll" - "c:\sys\bin\ui_mpxmusicplayercommonuitest.dll"
; Embedded SIS
; None
--- a/musicplayer_plat/mpx_music_player_media_key_handler_api/group/bld.inf Mon Jun 21 15:37:19 2010 +0300
+++ b/musicplayer_plat/mpx_music_player_media_key_handler_api/group/bld.inf Wed Oct 06 23:01:25 2010 +0100
@@ -27,3 +27,4 @@
../inc/mpxmediakeyhandlerobserver.h APP_LAYER_PLATFORM_EXPORT_PATH(mpxmediakeyhandlerobserver.h)
../inc/mpxmediakeyhandlerdefs.h APP_LAYER_PLATFORM_EXPORT_PATH(mpxmediakeyhandlerdefs.h)
+PRJ_TESTEXPORTS
--- a/musicplayer_plat/mpx_music_player_media_key_handler_api/tsrc/group/bld.inf Mon Jun 21 15:37:19 2010 +0300
+++ b/musicplayer_plat/mpx_music_player_media_key_handler_api/tsrc/group/bld.inf Wed Oct 06 23:01:25 2010 +0100
@@ -23,6 +23,7 @@
PRJ_TESTEXPORTS
+
PRJ_MMPFILES
PRJ_TESTMMPFILES
--- a/musicplayer_plat/mpx_music_player_media_key_handler_api/tsrc/init/TestFramework.ini Mon Jun 21 15:37:19 2010 +0300
+++ b/musicplayer_plat/mpx_music_player_media_key_handler_api/tsrc/init/TestFramework.ini Wed Oct 06 23:01:25 2010 +0100
@@ -62,7 +62,7 @@
# 'stifmeasurementplugin05' or 'stifbappeaprofiler'
Timeout= 0 # Default timeout value for each test case. In milliseconds
-UITestingSupport= YES
+#UITestingSupport= YES
[End_Defaults]
# -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- --
--- a/musicplayer_plat/mpx_music_player_media_key_handler_api/tsrc/ui_mpxmusicplayerkeyhandertest/group/bld.inf Mon Jun 21 15:37:19 2010 +0300
+++ b/musicplayer_plat/mpx_music_player_media_key_handler_api/tsrc/ui_mpxmusicplayerkeyhandertest/group/bld.inf Wed Oct 06 23:01:25 2010 +0100
@@ -26,6 +26,11 @@
// NOTE: If using ARS requirements all export operations should be done under this.
// 'abld test export'
+// To be used with emulator winscw
+..\..\init\TestFramework.ini c:\testframework\TestFramework.ini
+..\..\conf\ui_mpxmusicplayerkeyhandertest.cfg c:\testframework\ui_mpxmusicplayerkeyhandertest.cfg
+..\..\conf\ui_mpxmusicplayerkeyhandertest.bat c:\testframework\ui_mpxmusicplayerkeyhandertest.bat
+
PRJ_EXPORTS
// Specify the source file followed by its destination here
// copy will be used to copy the source file to its destination
--- a/musicplayer_plat/mpx_music_player_media_key_handler_api/tsrc/ui_mpxmusicplayerkeyhandertest/group/ui_mpxmusicplayerkeyhandertest.pkg Mon Jun 21 15:37:19 2010 +0300
+++ b/musicplayer_plat/mpx_music_player_media_key_handler_api/tsrc/ui_mpxmusicplayerkeyhandertest/group/ui_mpxmusicplayerkeyhandertest.pkg Wed Oct 06 23:01:25 2010 +0100
@@ -51,7 +51,7 @@
"..\..\init\TestFramework.ini" - "c:\testframework\TestFramework.ini"
"..\..\conf\ui_mpxmusicplayerkeyhandertest.cfg" - "c:\testframework\ui_mpxmusicplayerkeyhandertest.cfg"
-"\epoc32\release\armv5\urel\ui_mpxmusicplayerkeyhandertest.dll" - "c:\Sys\Bin\ui_mpxmusicplayerkeyhandertest.dll"
+"\epoc32\release\$(platform)\$(target)\ui_mpxmusicplayerkeyhandertest.dll" - "c:\sys\bin\ui_mpxmusicplayerkeyhandertest.dll"
; Embedded SIS
; None
--- a/musicplayer_plat/mpx_music_store_api/tsrc/group/bld.inf Mon Jun 21 15:37:19 2010 +0300
+++ b/musicplayer_plat/mpx_music_store_api/tsrc/group/bld.inf Wed Oct 06 23:01:25 2010 +0100
@@ -24,7 +24,6 @@
PRJ_TESTEXPORTS
// Test sound file
-
PRJ_MMPFILES
PRJ_TESTMMPFILES
--- a/musicplayer_plat/mpx_music_store_api/tsrc/init/TestFramework.ini Mon Jun 21 15:37:19 2010 +0300
+++ b/musicplayer_plat/mpx_music_store_api/tsrc/init/TestFramework.ini Wed Oct 06 23:01:25 2010 +0100
@@ -62,7 +62,7 @@
# 'stifmeasurementplugin05' or 'stifbappeaprofiler'
Timeout= 0 # Default timeout value for each test case. In milliseconds
-UITestingSupport= YES
+#UITestingSupport= YES
[End_Defaults]
# -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- --
--- a/musicplayer_plat/mpx_music_store_api/tsrc/mpxmusicstoretest/group/bld.inf Mon Jun 21 15:37:19 2010 +0300
+++ b/musicplayer_plat/mpx_music_store_api/tsrc/mpxmusicstoretest/group/bld.inf Wed Oct 06 23:01:25 2010 +0100
@@ -26,6 +26,11 @@
// NOTE: If using ARS requirements all export operations should be done under this.
// 'abld test export'
+// To be used with emulator winscw
+..\..\init\TestFramework.ini c:\testframework\TestFramework.ini
+..\..\conf\mpxmusicstoretest.cfg c:\testframework\mpxmusicstoretest.cfg
+..\..\conf\mpxmusicstoretest.bat c:\testframework\mpxmusicstoretest.bat
+
PRJ_EXPORTS
// Specify the source file followed by its destination here
// copy will be used to copy the source file to its destination
--- a/musicplayer_plat/mpx_music_store_api/tsrc/mpxmusicstoretest/group/mpxmusicstoretest.pkg Mon Jun 21 15:37:19 2010 +0300
+++ b/musicplayer_plat/mpx_music_store_api/tsrc/mpxmusicstoretest/group/mpxmusicstoretest.pkg Wed Oct 06 23:01:25 2010 +0100
@@ -50,7 +50,7 @@
; // STIF GUI (STIFTestFramework\Series60_UI is need to compile)
"..\..\init\TestFramework.ini" - "c:\testframework\TestFramework.ini"
"..\..\conf\mpxmusicstoretest.cfg" - "c:\testframework\mpxmusicstoretest.cfg"
-"\epoc32\release\armv5\udeb\mpxmusicstoretest.dll" - "c:\Sys\Bin\mpxmusicstoretest.dll"
+"\epoc32\release\$(platform)\$(target)\mpxmusicstoretest.dll" - "c:\sys\bin\mpxmusicstoretest.dll"
; Embedded SIS
; None
--- a/tsrc/group/bld.inf Mon Jun 21 15:37:19 2010 +0300
+++ b/tsrc/group/bld.inf Wed Oct 06 23:01:25 2010 +0100
@@ -21,6 +21,7 @@
DEFAULT
PRJ_TESTEXPORTS
+run_all_tests.bat c:\testframework\run_all_tests.bat
PRJ_EXPORTS