# HG changeset patch # User Dremov Kirill (Nokia-D-MSW/Tampere) # Date 1266614289 -7200 # Node ID fe71b07a6401353b910bcd3f429be9a24909f6c1 # Parent 28ae839b4c093e8f759048baf5cfeba3c093b672 Revision: 201003 Kit: 201007 diff -r 28ae839b4c09 -r fe71b07a6401 messagingfw/biomsgfw/BDB/group/BIODB.MMP --- a/messagingfw/biomsgfw/BDB/group/BIODB.MMP Tue Feb 02 10:12:21 2010 +0200 +++ b/messagingfw/biomsgfw/BDB/group/BIODB.MMP Fri Feb 19 23:18:09 2010 +0200 @@ -23,7 +23,7 @@ TARGETTYPE dll CAPABILITY All -TCB -//TARGETPATH \system\libs +//TARGETPATH /system/libs UID 0x10003C5E 0x10005542 VENDORID 0x70000001 SOURCEPATH ../../BDBSRC diff -r 28ae839b4c09 -r fe71b07a6401 messagingfw/biomsgfw/BITS/BITS.MMP --- a/messagingfw/biomsgfw/BITS/BITS.MMP Tue Feb 02 10:12:21 2010 +0200 +++ b/messagingfw/biomsgfw/BITS/BITS.MMP Fri Feb 19 23:18:09 2010 +0200 @@ -16,7 +16,7 @@ // TARGET bits.dll -//TARGETPATH \system\libs +//TARGETPATH /system/libs TARGETTYPE dll CAPABILITY All -TCB @@ -38,7 +38,7 @@ #ifdef WINS DEFFILE ./v2_wins.def #else -DEFFILE .\v2_eabi.def +DEFFILE ./v2_eabi.def #endif diff -r 28ae839b4c09 -r fe71b07a6401 messagingfw/biomsgfw/BITSTSRC/T_BIOLOG.MMP --- a/messagingfw/biomsgfw/BITSTSRC/T_BIOLOG.MMP Tue Feb 02 10:12:21 2010 +0200 +++ b/messagingfw/biomsgfw/BITSTSRC/T_BIOLOG.MMP Fri Feb 19 23:18:09 2010 +0200 @@ -14,14 +14,14 @@ // TARGET t_biolog.exe -//TARGETPATH \system\libs +//TARGETPATH /system/libs TARGETTYPE exe CAPABILITY All -TCB -SOURCEPATH ..\bitstsrc +SOURCEPATH ../bitstsrc SOURCE t_biolog.cpp -USERINCLUDE ..\bitstsrc +USERINCLUDE ../bitstsrc APP_LAYER_SYSTEMINCLUDE_SYMBIAN LIBRARY bits.lib euser.lib efsrv.lib // msgs.lib biut.lib diff -r 28ae839b4c09 -r fe71b07a6401 messagingfw/biomsgfw/BIUT/BLD.INF --- a/messagingfw/biomsgfw/BIUT/BLD.INF Tue Feb 02 10:12:21 2010 +0200 +++ b/messagingfw/biomsgfw/BIUT/BLD.INF Fri Feb 19 23:18:09 2010 +0200 @@ -37,6 +37,6 @@ group/BIUT.MMP PRJ_TESTMMPFILES -//..\Biuttsrc\t_biomsg.mmp +//../Biuttsrc/t_biomsg.mmp ../BIUTTSRC/t_ipaddr.mmp diff -r 28ae839b4c09 -r fe71b07a6401 messagingfw/biomsgfw/BIUT/group/BIUT.MMP --- a/messagingfw/biomsgfw/BIUT/group/BIUT.MMP Tue Feb 02 10:12:21 2010 +0200 +++ b/messagingfw/biomsgfw/BIUT/group/BIUT.MMP Fri Feb 19 23:18:09 2010 +0200 @@ -20,7 +20,7 @@ */ TARGET biut.dll -//TARGETPATH \system\libs +//TARGETPATH /system/libs TARGETTYPE dll CAPABILITY All -TCB diff -r 28ae839b4c09 -r fe71b07a6401 messagingfw/biomsgfw/BIUTTSRC/T_BIOMSG.MMP --- a/messagingfw/biomsgfw/BIUTTSRC/T_BIOMSG.MMP Tue Feb 02 10:12:21 2010 +0200 +++ b/messagingfw/biomsgfw/BIUTTSRC/T_BIOMSG.MMP Fri Feb 19 23:18:09 2010 +0200 @@ -14,14 +14,14 @@ // TARGET t_biomsg.exe -//TARGETPATH \system\libs +//TARGETPATH /system/libs TARGETTYPE exe CAPABILITY All -TCB -SOURCEPATH ..\biuttsrc +SOURCEPATH ../biuttsrc SOURCE t_biomsg.cpp -USERINCLUDE ..\biuttsrc +USERINCLUDE ../biuttsrc MW_LAYER_SYSTEMINCLUDE_SYMBIAN LIBRARY euser.lib msgs.lib estor.lib efsrv.lib imcm.lib biut.lib etext.lib diff -r 28ae839b4c09 -r fe71b07a6401 messagingfw/biomsgfw/BIUTTSRC/t_ipaddr.mmp --- a/messagingfw/biomsgfw/BIUTTSRC/t_ipaddr.mmp Tue Feb 02 10:12:21 2010 +0200 +++ b/messagingfw/biomsgfw/BIUTTSRC/t_ipaddr.mmp Fri Feb 19 23:18:09 2010 +0200 @@ -14,7 +14,7 @@ // TARGET t_ipaddr.exe -//TARGETPATH \system\libs +//TARGETPATH /system/libs TARGETTYPE exe CAPABILITY All -TCB diff -r 28ae839b4c09 -r fe71b07a6401 messagingfw/biomsgfw/BioWatchers/BLD.INF --- a/messagingfw/biomsgfw/BioWatchers/BLD.INF Tue Feb 02 10:12:21 2010 +0200 +++ b/messagingfw/biomsgfw/BioWatchers/BLD.INF Fri Feb 19 23:18:09 2010 +0200 @@ -28,10 +28,10 @@ class0sms.mmp PRJ_TESTMMPFILES -//\BioMsg\BioWatchers\test\T_WapWatcher.mmp manual -//\BioMsg\BioWatchers\test\T_NbsWatcher.mmp manual +///BioMsg/BioWatchers/test/T_WapWatcher.mmp manual +///BioMsg/BioWatchers/test/T_NbsWatcher.mmp manual PRJ_TESTEXPORTS -// This is used by SMCM\test\t_smssendrecv Test Harness That both sends and recieves +// This is used by SMCM/test/t_smssendrecv Test Harness That both sends and recieves Test/sendrecv.script /epoc32/wins/c/test/sms/sendrecv.script Test/sendrecv.script /epoc32/winscw/c/test/sms/sendrecv.script diff -r 28ae839b4c09 -r fe71b07a6401 messagingfw/biomsgfw/BioWatchers/Test/T_NbsWatcher.mmp --- a/messagingfw/biomsgfw/BioWatchers/Test/T_NbsWatcher.mmp Tue Feb 02 10:12:21 2010 +0200 +++ b/messagingfw/biomsgfw/BioWatchers/Test/T_NbsWatcher.mmp Fri Feb 19 23:18:09 2010 +0200 @@ -18,8 +18,8 @@ CAPABILITY All -TCB -SOURCEPATH ..\test -USERINCLUDE ..\inc +SOURCEPATH ../test +USERINCLUDE ../inc MW_LAYER_SYSTEMINCLUDE_SYMBIAN SOURCE T_NbsWatcher.cpp LIBRARY euser.lib efsrv.lib etext.lib BAFL.lib estor.lib esock.lib NbsWatcher.lib gsmu.lib smsu.lib watcher.lib MsvTestUtils.lib diff -r 28ae839b4c09 -r fe71b07a6401 messagingfw/biomsgfw/BioWatchers/Test/T_WapWatcher.mmp --- a/messagingfw/biomsgfw/BioWatchers/Test/T_WapWatcher.mmp Tue Feb 02 10:12:21 2010 +0200 +++ b/messagingfw/biomsgfw/BioWatchers/Test/T_WapWatcher.mmp Fri Feb 19 23:18:09 2010 +0200 @@ -18,8 +18,8 @@ CAPABILITY All -TCB -SOURCEPATH ..\test -USERINCLUDE ..\inc +SOURCEPATH ../test +USERINCLUDE ../inc MW_LAYER_SYSTEMINCLUDE_SYMBIAN SOURCE T_WapWatcher.cpp LIBRARY euser.lib efsrv.lib etext.lib BAFL.lib estor.lib esock.lib WapWatcher.lib gsmu.lib smsu.lib watcher.lib MsvTestUtils.lib bits.lib diff -r 28ae839b4c09 -r fe71b07a6401 messagingfw/biomsgfw/CBCPTSRC/T_CBCP.MMP --- a/messagingfw/biomsgfw/CBCPTSRC/T_CBCP.MMP Tue Feb 02 10:12:21 2010 +0200 +++ b/messagingfw/biomsgfw/CBCPTSRC/T_CBCP.MMP Fri Feb 19 23:18:09 2010 +0200 @@ -30,9 +30,9 @@ #ifdef WINS DEFFILE ../BIOS/bwins/bios.def #elif defined (GCC32) -DEFFILE ..\bios\marm.def +DEFFILE ../bios/marm.def #else -DEFFILE ..\bios\eabi\bios.def +DEFFILE ../bios/eabi/bios.def #endif VENDORID 0x70000001 diff -r 28ae839b4c09 -r fe71b07a6401 messagingfw/biomsgfw/IACPTSRC/T_DB.MMP --- a/messagingfw/biomsgfw/IACPTSRC/T_DB.MMP Tue Feb 02 10:12:21 2010 +0200 +++ b/messagingfw/biomsgfw/IACPTSRC/T_DB.MMP Fri Feb 19 23:18:09 2010 +0200 @@ -19,12 +19,12 @@ TARGETTYPE exe CAPABILITY All -TCB -SOURCEPATH ..\iacptsrc +SOURCEPATH ../iacptsrc SOURCE t_db.cpp -USERINCLUDE ..\iacptsrc -USERINCLUDE ..\iacpinc -USERINCLUDE ..\biutinc +USERINCLUDE ../iacptsrc +USERINCLUDE ../iacpinc +USERINCLUDE ../biutinc MW_LAYER_SYSTEMINCLUDE_SYMBIAN LIBRARY euser.lib msgs.lib LIBRARY biut.lib bits.lib commdb.lib MsvTestUtils.lib diff -r 28ae839b4c09 -r fe71b07a6401 messagingfw/msgconf/group/messaging_config.mmp --- a/messagingfw/msgconf/group/messaging_config.mmp Tue Feb 02 10:12:21 2010 +0200 +++ b/messagingfw/msgconf/group/messaging_config.mmp Fri Feb 19 23:18:09 2010 +0200 @@ -11,8 +11,8 @@ // Contributors: // // Description: -// MMP file to compile only the resource files present in messging_config\biomsg component -// Compilation of resource files present in messging_config\biomsg component +// MMP file to compile only the resource files present in messging_config/biomsg component +// Compilation of resource files present in messging_config/biomsg component // // diff -r 28ae839b4c09 -r fe71b07a6401 messagingfw/msgsrvnstore/group/messaging_framework.history.xml --- a/messagingfw/msgsrvnstore/group/messaging_framework.history.xml Tue Feb 02 10:12:21 2010 +0200 +++ b/messagingfw/msgsrvnstore/group/messaging_framework.history.xml Fri Feb 19 23:18:09 2010 +0200 @@ -4,6 +4,10 @@ Framework for storage, retrieval, editing, sending and receiving of messages such as email or SMS. + + messaging DB name was passed [1000484b]messaging.db instead of [1000484B]messaging.db to SQL Server + + changed error handling while creating conversion status table. diff -r 28ae839b4c09 -r fe71b07a6401 messagingfw/msgsrvnstore/mtmbase/test/group/T_ui.mmp --- a/messagingfw/msgsrvnstore/mtmbase/test/group/T_ui.mmp Tue Feb 02 10:12:21 2010 +0200 +++ b/messagingfw/msgsrvnstore/mtmbase/test/group/T_ui.mmp Fri Feb 19 23:18:09 2010 +0200 @@ -14,11 +14,11 @@ // TARGET T_UI.exe -TARGETPATH \system\programs +TARGETPATH /system/programs TARGETTYPE epocexe CAPABILITY All -TCB -SOURCEPATH ..\src +SOURCEPATH ../src SOURCE T_UI.cpp MW_LAYER_SYSTEMINCLUDE_SYMBIAN LIBRARY euser.lib msgs.lib mtur.lib diff -r 28ae839b4c09 -r fe71b07a6401 messagingfw/msgsrvnstore/server/inc/MSVSERV.H --- a/messagingfw/msgsrvnstore/server/inc/MSVSERV.H Tue Feb 02 10:12:21 2010 +0200 +++ b/messagingfw/msgsrvnstore/server/inc/MSVSERV.H Fri Feb 19 23:18:09 2010 +0200 @@ -53,7 +53,7 @@ #if (defined SYMBIAN_MESSAGESTORE_UNIT_TESTCODE) _LIT(KMsvDbFile, "\\messaging.db"); #else - _LIT(KMsvDbFile, "[1000484b]messaging.db"); + _LIT(KMsvDbFile, "[1000484B]messaging.db"); #endif // #if (defined SYMBIAN_MESSAGESTORE_UNIT_TESTCODE) // Remove these to remove server logging diff -r 28ae839b4c09 -r fe71b07a6401 messagingfw/msgsrvnstore/server/inc/msvsearchsortcachemanager.h --- a/messagingfw/msgsrvnstore/server/inc/msvsearchsortcachemanager.h Tue Feb 02 10:12:21 2010 +0200 +++ b/messagingfw/msgsrvnstore/server/inc/msvsearchsortcachemanager.h Fri Feb 19 23:18:09 2010 +0200 @@ -89,6 +89,11 @@ void RetrunQuery(TInt aIndex, CMsvSearchSortQuery* aCLientQuery); void ResetSearchSortCache(); TSearchSortDbWrapper* GetDbWrapper(); + //For Simultaneously query + void AddOutstandingSOSOperation(); + TInt OutstandingSOSOperations(); + + private: static CMSvSearchSortCacheManager* CreateManagerL(CMsvServer& aServer); //Private CreateL void ConstructL(); //Private Constructor. @@ -125,7 +130,9 @@ CMsvServer &iServer; CMsvSearchSortDeltaCache* iSearchSortDeltaCache; TSearchSortDbWrapper* iSearchDbAdapter; - + //For Simultaneously query + mutable TInt iOutstandingSOSOperations; + friend class CMsvIndexAdapter; friend class CMsvServer; friend class CMsvSearchSortCacheEntry; diff -r 28ae839b4c09 -r fe71b07a6401 messagingfw/msgsrvnstore/server/src/MSVSESS.CPP --- a/messagingfw/msgsrvnstore/server/src/MSVSESS.CPP Tue Feb 02 10:12:21 2010 +0200 +++ b/messagingfw/msgsrvnstore/server/src/MSVSESS.CPP Fri Feb 19 23:18:09 2010 +0200 @@ -3112,6 +3112,16 @@ ****************************************/ void CMsvServerSession::SearchSortOnHeaderAndBodytMsgL(const RMessage2& aMessage) { + //For Simultaneously query + if(CMSvSearchSortCacheManager::Instance()->OutstandingSOSOperations() > 0) + { + if(CMSvSearchSortCacheManager::Instance()->iProgress != KMsvSearchSortOpCompleted) + { + User::Leave(KErrServerBusy); // One is SOS request is under proress. + } + } + CMSvSearchSortCacheManager::Instance()->AddOutstandingSOSOperation(); + //Header and body. TMsvOp operationId = aMessage.Int0(); @@ -3171,6 +3181,16 @@ void CMsvServerSession::SearchSortOnIndexEntryL(const RMessage2& aMessage) { + //For Simultaneously query + if(CMSvSearchSortCacheManager::Instance()->OutstandingSOSOperations() > 0) + { + if(CMSvSearchSortCacheManager::Instance()->iProgress != KMsvSearchSortOpCompleted) + { + User::Leave(KErrServerBusy); // One is SOS request is under proress. + } + } + CMSvSearchSortCacheManager::Instance()->AddOutstandingSOSOperation(); + //Search sort on index entry. // Recover the operation data TMsvOp operationId = aMessage.Int0(); @@ -3480,6 +3500,16 @@ void CMsvServerSession::GetResultForQueryIDL(const RMessage2& aMessage) { + //For Simultaneously query + if(CMSvSearchSortCacheManager::Instance()->OutstandingSOSOperations() > 0) + { + if(CMSvSearchSortCacheManager::Instance()->iProgress != KMsvSearchSortOpCompleted ) + { + User::Leave(KErrServerBusy); // One is SOS request is under proress. + } + } + CMSvSearchSortCacheManager::Instance()->AddOutstandingSOSOperation(); + TInt operationId = aMessage.Int0(); TInt queryID = aMessage.Int1(); diff -r 28ae839b4c09 -r fe71b07a6401 messagingfw/msgsrvnstore/server/src/MSVTIME.CPP --- a/messagingfw/msgsrvnstore/server/src/MSVTIME.CPP Tue Feb 02 10:12:21 2010 +0200 +++ b/messagingfw/msgsrvnstore/server/src/MSVTIME.CPP Fri Feb 19 23:18:09 2010 +0200 @@ -78,10 +78,10 @@ TTime TMsvTime::MinTime() const { - return TTime(TDateTime(1980,EJanuary,0,0,0,0,0)); + return TTime(TDateTime(1900,EJanuary,0,0,0,0,0)); } TTime TMsvTime::MaxTime() const { - return TTime(TDateTime(2100,EDecember,30,0,0,0,0)); + return TTime(TDateTime(2100,EDecember,30,23,59,59,0)); } diff -r 28ae839b4c09 -r fe71b07a6401 messagingfw/msgsrvnstore/server/src/cmsvconverterwaiter.cpp --- a/messagingfw/msgsrvnstore/server/src/cmsvconverterwaiter.cpp Tue Feb 02 10:12:21 2010 +0200 +++ b/messagingfw/msgsrvnstore/server/src/cmsvconverterwaiter.cpp Fri Feb 19 23:18:09 2010 +0200 @@ -29,7 +29,7 @@ #if (defined SYMBIAN_MESSAGESTORE_UNIT_TESTCODE) _LIT(KMessagingDBName, "\\messaging.db"); #else - _LIT(KMessagingDBName,"[1000484b]messaging.db"); + _LIT(KMessagingDBName,"[1000484B]messaging.db"); #endif diff -r 28ae839b4c09 -r fe71b07a6401 messagingfw/msgsrvnstore/server/src/msvdbadapter.cpp --- a/messagingfw/msgsrvnstore/server/src/msvdbadapter.cpp Tue Feb 02 10:12:21 2010 +0200 +++ b/messagingfw/msgsrvnstore/server/src/msvdbadapter.cpp Fri Feb 19 23:18:09 2010 +0200 @@ -48,8 +48,8 @@ _LIT(KMainDummyDBName, "\\messaging_master.db"); _LIT(KMessagingDBName, "\\messaging.db"); #else - _LIT(KMainDummyDBName, "[1000484b]messaging_master.db"); - _LIT(KMessagingDBName, "[1000484b]messaging.db"); + _LIT(KMainDummyDBName, "[1000484B]messaging_master.db"); + _LIT(KMessagingDBName, "[1000484B]messaging.db"); #endif _LIT(KLogicalName, "DB"); diff -r 28ae839b4c09 -r fe71b07a6401 messagingfw/msgsrvnstore/server/src/msvsearchsortcachemanager.cpp --- a/messagingfw/msgsrvnstore/server/src/msvsearchsortcachemanager.cpp Tue Feb 02 10:12:21 2010 +0200 +++ b/messagingfw/msgsrvnstore/server/src/msvsearchsortcachemanager.cpp Fri Feb 19 23:18:09 2010 +0200 @@ -58,6 +58,7 @@ */ CMSvSearchSortCacheManager::~CMSvSearchSortCacheManager() { + iOutstandingSOSOperations = 0; iMsvIdWithSortFieldArray.Close(); iToFindResultAsIdArray.Close(); iFinalResultAsIdArray.Close(); @@ -144,6 +145,10 @@ iProgress = KMsvSearchSortOpNone; iCancelFlag = EFalse; iExplicitSortOnDateTime = EFalse; + + //For Simultaneously query + iOutstandingSOSOperations = 0; + if(CMsvEntryFreePool::Instance()->iMsvMaximumCacheSize != NULL && CMsvEntryFreePool::Instance()->iMsvSearchSortCache) { iMsvMaximumSearchSortCacheSize = ((CMsvEntryFreePool::Instance()->iMsvMaximumCacheSize * CMsvEntryFreePool::Instance()->iMsvSearchSortCache)/100)*1024 ; @@ -912,6 +917,10 @@ FinalResultAsIdL(aEntry); iReturnResultType = KFinalResult; iProgress = KMsvSearchSortOpCompleted; + if(iOutstandingSOSOperations>0) + { + iOutstandingSOSOperations--; + } } else { @@ -937,6 +946,10 @@ { FirstResultForInteraratorNewQueryL(aEntry); iReturnResultType = KFinalResult; + if(iOutstandingSOSOperations>0) + { + iOutstandingSOSOperations--; + } } #endif else @@ -986,6 +999,10 @@ OnDemandUpdateCacheEntryL(aIndex); iReturnResultType = KFinalResult; iProgress = KMsvSearchSortOpCompleted; + if(iOutstandingSOSOperations>0) + { + iOutstandingSOSOperations--; + } } else { @@ -993,7 +1010,11 @@ if(!iSearchSortDeltaCache->iDeltaCacheDirtyFlag) { iReturnResultType = KFinalResult; - iProgress = KMsvSearchSortOpCompleted; + iProgress = KMsvSearchSortOpCompleted; + if(iOutstandingSOSOperations>0) + { + iOutstandingSOSOperations--; + } } else { @@ -1026,7 +1047,11 @@ FirstResultForInteraratorQueryIdL(aIndex); iReturnResultType = KFinalResult; iProgress = KMsvSearchSortOpIterationEnabled; - } + if(iOutstandingSOSOperations>0) + { + iOutstandingSOSOperations--; + } + } else { // Not Supported. @@ -1344,6 +1369,10 @@ iSearchDbAdapter->GetSortedTMsvIdsfromTableL((*iManagerEntry)[aIndex-1]->iQueryID,iMsvSearchSortCacheManager->iFinalResultAsIdArray, (*iManagerEntry)[aIndex-1]->IsAscendingSort()/*Default = EFalse*/,(*iManagerEntry)[aIndex-1]->iMsgExplicitSortPart); iReturnResultType = KFinalResult; iProgress = KMsvSearchSortOpCompleted; + if(iOutstandingSOSOperations>0) + { + iOutstandingSOSOperations--; + } aToUpdateDb.Reset(); } @@ -1365,6 +1394,10 @@ iProgress = KMsvSearchSortOpCompleted; } iMsvSearchSortCacheManager->iMsvIdWithSortFieldArray.Reset(); + if(iOutstandingSOSOperations>0) + { + iOutstandingSOSOperations--; + } return iReturnResultType; } @@ -1403,6 +1436,10 @@ iSearchDbAdapter->GetIdsInIteratorNewQueryL(aEntry); #endif iProgress = KMsvSearchSortOpCompleted; + if(iOutstandingSOSOperations>0) + { + iOutstandingSOSOperations--; + } } else { @@ -1412,6 +1449,10 @@ iSearchDbAdapter->GetIdsInIteratorNewQueryL(aEntry); #endif iProgress = KMsvSearchSortOpCompleted; + if(iOutstandingSOSOperations>0) + { + iOutstandingSOSOperations--; + } } } @@ -1433,12 +1474,20 @@ //iSearchDbAdapter->GetIdsInIteratorQueryIdL((*iManagerEntry)[index]->iQueryID); iSearchDbAdapter->GetIdsInIteratorQueryIdL((*iManagerEntry)[index]->iQueryID, (*iManagerEntry)[index]->IsAscendingSort(), (*iManagerEntry)[index]->iMsgExplicitSortPart); iProgress = KMsvSearchSortOpCompleted; - } + if(iOutstandingSOSOperations>0) + { + iOutstandingSOSOperations--; + } + } else { //iSearchDbAdapter->GetIdsInIteratorQueryIdL((*iManagerEntry)[index]->iQueryID); iSearchDbAdapter->GetIdsInIteratorQueryIdL((*iManagerEntry)[index]->iQueryID, (*iManagerEntry)[index]->IsAscendingSort(), (*iManagerEntry)[index]->iMsgExplicitSortPart); iProgress = KMsvSearchSortOpCompleted; + if(iOutstandingSOSOperations>0) + { + iOutstandingSOSOperations--; + } } } @@ -1459,6 +1508,13 @@ //iSearchDbAdapter->GetNextIdL( (*iManagerEntry)[aIndex]->iQueryID , iIteratorId,iIteratorRemainingResultCount); iSearchDbAdapter->GetNextIdL(iIteratorId,iIteratorRemainingResultCount); iProgress = KMsvSearchSortOpCompleted; + if(iIteratorRemainingResultCount == 0) + { + if(iOutstandingSOSOperations>0) + { + iOutstandingSOSOperations--; + } + } } else { @@ -1469,6 +1525,13 @@ iServer.IndexAdapter().GetEntry(iIteratorId,entry); iIteratorEntry = *entry; iProgress = KMsvSearchSortOpCompleted; + if(iIteratorRemainingResultCount == 0) + { + if(iOutstandingSOSOperations>0) + { + iOutstandingSOSOperations--; + } + } } } @@ -1550,6 +1613,10 @@ TInt CMSvSearchSortCacheManager::CancelSearchSortOperation() const { iMsvSearchSortCacheManager->iCancelFlag = ETrue; + if(iOutstandingSOSOperations>0) + { + iOutstandingSOSOperations--; + } return 0; } @@ -1638,3 +1705,16 @@ return iSearchDbAdapter; } +//For Simultaneously query +void CMSvSearchSortCacheManager::AddOutstandingSOSOperation() + { + iOutstandingSOSOperations++; + } + +TInt CMSvSearchSortCacheManager::OutstandingSOSOperations() + { + return iOutstandingSOSOperations; + } + + + diff -r 28ae839b4c09 -r fe71b07a6401 messagingfw/msgsrvnstore/server/test/Unittef/src/t_msv_cache_visiblefolder_step.cpp --- a/messagingfw/msgsrvnstore/server/test/Unittef/src/t_msv_cache_visiblefolder_step.cpp Tue Feb 02 10:12:21 2010 +0200 +++ b/messagingfw/msgsrvnstore/server/test/Unittef/src/t_msv_cache_visiblefolder_step.cpp Fri Feb 19 23:18:09 2010 +0200 @@ -40,7 +40,7 @@ #ifdef SYMBIAN_MESSAGESTORE_UNIT_TESTCODE _LIT(KTestDbFileName, "c:\\messaging.db"); #else -_LIT(KTestDbFileName, "c:[1000484b]testDB.db"); +_LIT(KTestDbFileName, "c:[1000484B]testDB.db"); #endif _LIT(KSTDMSGINI, "C:\\private\\1000484b\\msgcache.ini"); _LIT(KMSGINI_2, "C:\\private\\1000484b\\msgcache2.ini"); diff -r 28ae839b4c09 -r fe71b07a6401 messagingfw/msgsrvnstore/server/test/base/group/OBSEXE1.mmp --- a/messagingfw/msgsrvnstore/server/test/base/group/OBSEXE1.mmp Tue Feb 02 10:12:21 2010 +0200 +++ b/messagingfw/msgsrvnstore/server/test/base/group/OBSEXE1.mmp Fri Feb 19 23:18:09 2010 +0200 @@ -13,15 +13,15 @@ // Description: // -TARGETPATH \system\programs +TARGETPATH /system/programs TARGET obsexe1.exe TARGETTYPE exe CAPABILITY All -TCB UID 0x1000007a 0x10004F2B VENDORID 0x70000001 -SOURCEPATH ..\src -USERINCLUDE ..\inc +SOURCEPATH ../src +USERINCLUDE ../inc SOURCE obsexe1.cpp MW_LAYER_SYSTEMINCLUDE_SYMBIAN LIBRARY euser.lib efsrv.lib diff -r 28ae839b4c09 -r fe71b07a6401 messagingfw/msgsrvnstore/server/test/base/group/OBSEXE2.mmp --- a/messagingfw/msgsrvnstore/server/test/base/group/OBSEXE2.mmp Tue Feb 02 10:12:21 2010 +0200 +++ b/messagingfw/msgsrvnstore/server/test/base/group/OBSEXE2.mmp Fri Feb 19 23:18:09 2010 +0200 @@ -13,15 +13,15 @@ // Description: // -TARGETPATH \system\programs +TARGETPATH /system/programs TARGET obsexe2.exe TARGETTYPE exe CAPABILITY All -TCB UID 0x1000007a 0x10004F2B VENDORID 0x70000001 -SOURCEPATH ..\src -USERINCLUDE ..\inc +SOURCEPATH ../src +USERINCLUDE ../inc SOURCE obsexe2.cpp MW_LAYER_SYSTEMINCLUDE_SYMBIAN LIBRARY euser.lib efsrv.lib diff -r 28ae839b4c09 -r fe71b07a6401 messagingfw/msgsrvnstore/server/test/testrom/bld.inf --- a/messagingfw/msgsrvnstore/server/test/testrom/bld.inf Tue Feb 02 10:12:21 2010 +0200 +++ b/messagingfw/msgsrvnstore/server/test/testrom/bld.inf Fri Feb 19 23:18:09 2010 +0200 @@ -15,7 +15,7 @@ PRJ_TESTEXPORTS -t_msgs_prepare_for_test.bat \epoc32\data\z\system\msgtest\urel\t_msgs_prepare_for_test.bat -t_msgs_prepare_for_test.bat \epoc32\data\z\system\msgtest\udeb\t_msgs_prepare_for_test.bat -t_msgs.iby \epoc32\rom\include\t_msgs.iby +t_msgs_prepare_for_test.bat /epoc32/data/z/system/msgtest/urel/t_msgs_prepare_for_test.bat +t_msgs_prepare_for_test.bat /epoc32/data/z/system/msgtest/udeb/t_msgs_prepare_for_test.bat +t_msgs.iby /epoc32/rom/include/t_msgs.iby diff -r 28ae839b4c09 -r fe71b07a6401 messagingfw/msgsrvnstore/server/test/unit/group/t_msgs_backup.mmp --- a/messagingfw/msgsrvnstore/server/test/unit/group/t_msgs_backup.mmp Tue Feb 02 10:12:21 2010 +0200 +++ b/messagingfw/msgsrvnstore/server/test/unit/group/t_msgs_backup.mmp Fri Feb 19 23:18:09 2010 +0200 @@ -20,7 +20,7 @@ SOURCEPATH src USERINCLUDE inc SOURCE T_BACKUP.cpp -USERINCLUDE ..\msgsinc +USERINCLUDE ../msgsinc MW_LAYER_SYSTEMINCLUDE_SYMBIAN LIBRARY euser.lib msgs.lib estor.lib efsrv.lib MsvTestUtils.lib testbackupserver.lib sqldb.lib diff -r 28ae839b4c09 -r fe71b07a6401 messagingfw/msgtest/targetautomation/BLD.INF --- a/messagingfw/msgtest/targetautomation/BLD.INF Tue Feb 02 10:12:21 2010 +0200 +++ b/messagingfw/msgtest/targetautomation/BLD.INF Fri Feb 19 23:18:09 2010 +0200 @@ -13,20 +13,20 @@ // Description: // -#include "Delay\bld.inf" -#include "Rom\bld.inf" -#include "SerialLog\bld.inf" -#include "StayAwake\bld.inf" -#include "TechviewStart\bld.inf" +#include "Delay/bld.inf" +#include "Rom/bld.inf" +#include "SerialLog/bld.inf" +#include "StayAwake/bld.inf" +#include "TechviewStart/bld.inf" -#include "..\..\msgtests\imcmtsrc\testrom\bld.inf" -#include "..\..\msgtests\impstsrc\testrom\bld.inf" -#include "..\..\msgtests\imuttsrc\testrom\bld.inf" -#include "..\..\msgtests\msgstsrc\testrom\bld.inf" -#include "..\..\msgtests\popstsrc\testrom\bld.inf" -#include "..\..\msgtests\sendtsrc\testrom\bld.inf" -#include "..\..\msgtests\smcm\test\testrom\bld.inf" -#include "..\..\msgtests\smtstsrc\testrom\bld.inf" -#include "..\testrom\bld.inf" +#include "../../msgtests/imcmtsrc/testrom/bld.inf" +#include "../../msgtests/impstsrc/testrom/bld.inf" +#include "../../msgtests/imuttsrc/testrom/bld.inf" +#include "../../msgtests/msgstsrc/testrom/bld.inf" +#include "../../msgtests/popstsrc/testrom/bld.inf" +#include "../../msgtests/sendtsrc/testrom/bld.inf" +#include "../../msgtests/smcm/test/testrom/bld.inf" +#include "../../msgtests/smtstsrc/testrom/bld.inf" +#include "../testrom/bld.inf" diff -r 28ae839b4c09 -r fe71b07a6401 messagingfw/msgtest/targetautomation/Delay/BLD.INF --- a/messagingfw/msgtest/targetautomation/Delay/BLD.INF Tue Feb 02 10:12:21 2010 +0200 +++ b/messagingfw/msgtest/targetautomation/Delay/BLD.INF Fri Feb 19 23:18:09 2010 +0200 @@ -14,4 +14,4 @@ // PRJ_TESTMMPFILES -..\..\Automate\Delay\t_delay.mmp +../../Automate/Delay/t_delay.mmp diff -r 28ae839b4c09 -r fe71b07a6401 messagingfw/msgtest/targetautomation/Delay/T_delay.mmp --- a/messagingfw/msgtest/targetautomation/Delay/T_delay.mmp Tue Feb 02 10:12:21 2010 +0200 +++ b/messagingfw/msgtest/targetautomation/Delay/T_delay.mmp Fri Feb 19 23:18:09 2010 +0200 @@ -17,9 +17,9 @@ TARGETTYPE exe CAPABILITY All -TCB -SOURCEPATH ..\delay +SOURCEPATH ../delay SOURCE t_delay.cpp -USERINCLUDE \epoc32\include +USERINCLUDE /epoc32/include MW_LAYER_SYSTEMINCLUDE_SYMBIAN LIBRARY euser.lib bafl.lib EPOCSTACKSIZE 0x4000 diff -r 28ae839b4c09 -r fe71b07a6401 messagingfw/msgtest/targetautomation/Rom/bld.inf --- a/messagingfw/msgtest/targetautomation/Rom/bld.inf Tue Feb 02 10:12:21 2010 +0200 +++ b/messagingfw/msgtest/targetautomation/Rom/bld.inf Fri Feb 19 23:18:09 2010 +0200 @@ -14,6 +14,6 @@ // PRJ_TESTEXPORTS -..\..\Automate\Rom\MsgTestUtils.iby \epoc32\rom\include\MsgTestUtils.iby -..\..\Automate\Rom\MsgTest.oby \epoc32\rom\include\MsgTest.oby +../../Automate/Rom/MsgTestUtils.iby /epoc32/rom/include/MsgTestUtils.iby +../../Automate/Rom/MsgTest.oby /epoc32/rom/include/MsgTest.oby diff -r 28ae839b4c09 -r fe71b07a6401 messagingfw/msgtest/targetautomation/Script/autotest.txt --- a/messagingfw/msgtest/targetautomation/Script/autotest.txt Tue Feb 02 10:12:21 2010 +0200 +++ b/messagingfw/msgtest/targetautomation/Script/autotest.txt Fri Feb 19 23:18:09 2010 +0200 @@ -1,7 +1,7 @@ # Copyright (c) 2002-2009 Nokia Corporation and/or its subsidiary(-ies). # All rights reserved. # This component and the accompanying materials are made available -# under the terms of "Eclipse Public License v1.0" +# under the terms of the License "Eclipse Public License v1.0" # which accompanies this distribution, and is available # at the URL "http://www.eclipse.org/legal/epl-v10.html". # diff -r 28ae839b4c09 -r fe71b07a6401 messagingfw/msgtest/targetautomation/SerialLog/BLD.INF --- a/messagingfw/msgtest/targetautomation/SerialLog/BLD.INF Tue Feb 02 10:12:21 2010 +0200 +++ b/messagingfw/msgtest/targetautomation/SerialLog/BLD.INF Fri Feb 19 23:18:09 2010 +0200 @@ -14,4 +14,4 @@ // PRJ_TESTMMPFILES -..\..\Automate\SerialLog\t_seriallog.mmp +../../Automate/SerialLog/t_seriallog.mmp diff -r 28ae839b4c09 -r fe71b07a6401 messagingfw/msgtest/targetautomation/SerialLog/T_seriallog.mmp --- a/messagingfw/msgtest/targetautomation/SerialLog/T_seriallog.mmp Tue Feb 02 10:12:21 2010 +0200 +++ b/messagingfw/msgtest/targetautomation/SerialLog/T_seriallog.mmp Fri Feb 19 23:18:09 2010 +0200 @@ -17,9 +17,9 @@ TARGETTYPE exe CAPABILITY All -TCB -SOURCEPATH ..\seriallog +SOURCEPATH ../seriallog SOURCE t_seriallog.cpp -USERINCLUDE \epoc32\include +USERINCLUDE /epoc32/include MW_LAYER_SYSTEMINCLUDE_SYMBIAN LIBRARY euser.lib bafl.lib efsrv.lib EPOCSTACKSIZE 0x4000 diff -r 28ae839b4c09 -r fe71b07a6401 messagingfw/msgtest/targetautomation/StayAwake/StayAwake.mmp --- a/messagingfw/msgtest/targetautomation/StayAwake/StayAwake.mmp Tue Feb 02 10:12:21 2010 +0200 +++ b/messagingfw/msgtest/targetautomation/StayAwake/StayAwake.mmp Fri Feb 19 23:18:09 2010 +0200 @@ -18,8 +18,8 @@ CAPABILITY All -TCB -sourcepath ..\StayAwake -systeminclude \epoc32\include +sourcepath ../StayAwake +systeminclude /epoc32/include MW_LAYER_SYSTEMINCLUDE_SYMBIAN source StayAwake.cpp diff -r 28ae839b4c09 -r fe71b07a6401 messagingfw/msgtest/targetautomation/StayAwake/bld.inf --- a/messagingfw/msgtest/targetautomation/StayAwake/bld.inf Tue Feb 02 10:12:21 2010 +0200 +++ b/messagingfw/msgtest/targetautomation/StayAwake/bld.inf Fri Feb 19 23:18:09 2010 +0200 @@ -14,4 +14,4 @@ // PRJ_TESTMMPFILES -..\..\Automate\StayAwake\StayAwake.mmp +../../Automate/StayAwake/StayAwake.mmp diff -r 28ae839b4c09 -r fe71b07a6401 messagingfw/msgtest/targetautomation/TechviewStart/Start.mmp --- a/messagingfw/msgtest/targetautomation/TechviewStart/Start.mmp Tue Feb 02 10:12:21 2010 +0200 +++ b/messagingfw/msgtest/targetautomation/TechviewStart/Start.mmp Fri Feb 19 23:18:09 2010 +0200 @@ -22,7 +22,7 @@ targettype EXEDLL CAPABILITY All -TCB -targetpath \SYSTEM\PROGRAMS +targetpath /SYSTEM/PROGRAMS UID 0x1000008D 0x10009B16 VENDORID 0x70000001 @@ -41,9 +41,9 @@ library EFSRV.LIB BAFL.LIB msvtestutils.lib #ifdef WINS -DEFFILE .\wins.def +DEFFILE ./wins.def #else -DEFFILE .\marm.def +DEFFILE ./marm.def #endif SMPSAFE diff -r 28ae839b4c09 -r fe71b07a6401 messagingfw/msgtest/targetautomation/TechviewStart/bld.inf --- a/messagingfw/msgtest/targetautomation/TechviewStart/bld.inf Tue Feb 02 10:12:21 2010 +0200 +++ b/messagingfw/msgtest/targetautomation/TechviewStart/bld.inf Fri Feb 19 23:18:09 2010 +0200 @@ -14,4 +14,4 @@ // PRJ_TESTMMPFILES -..\TechviewStart\Start.mmp +../TechviewStart/Start.mmp diff -r 28ae839b4c09 -r fe71b07a6401 messagingfw/msgtest/testrom/bld.inf --- a/messagingfw/msgtest/testrom/bld.inf Tue Feb 02 10:12:21 2010 +0200 +++ b/messagingfw/msgtest/testrom/bld.inf Fri Feb 19 23:18:09 2010 +0200 @@ -15,7 +15,7 @@ PRJ_TESTEXPORTS -t_test_prepare_for_test.bat \epoc32\data\z\system\msgtest\urel\t_test_prepare_for_test.bat -t_test_prepare_for_test.bat \epoc32\data\z\system\msgtest\udeb\t_test_prepare_for_test.bat -t_test.iby \epoc32\rom\include\t_test.iby +t_test_prepare_for_test.bat /epoc32/data/z/system/msgtest/urel/t_test_prepare_for_test.bat +t_test_prepare_for_test.bat /epoc32/data/z/system/msgtest/udeb/t_test_prepare_for_test.bat +t_test.iby /epoc32/rom/include/t_test.iby diff -r 28ae839b4c09 -r fe71b07a6401 messagingfw/msgtest/testutils/base/test/group/t_testutils.mmp --- a/messagingfw/msgtest/testutils/base/test/group/t_testutils.mmp Tue Feb 02 10:12:21 2010 +0200 +++ b/messagingfw/msgtest/testutils/base/test/group/t_testutils.mmp Fri Feb 19 23:18:09 2010 +0200 @@ -21,7 +21,7 @@ VENDORID 0x70000001 SOURCEPATH . SOURCE T_testutils.cpp -USERINCLUDE ..\inc +USERINCLUDE ../inc MW_LAYER_SYSTEMINCLUDE_SYMBIAN LIBRARY euser.lib efsrv.lib logwrap.lib logcli.lib msvtestutils.lib emailtestutils.lib diff -r 28ae839b4c09 -r fe71b07a6401 messagingfw/msgtest/testutils/sms/test/group/MsgScriptsTest.mmp --- a/messagingfw/msgtest/testutils/sms/test/group/MsgScriptsTest.mmp Tue Feb 02 10:12:21 2010 +0200 +++ b/messagingfw/msgtest/testutils/sms/test/group/MsgScriptsTest.mmp Fri Feb 19 23:18:09 2010 +0200 @@ -20,7 +20,7 @@ SOURCEPATH . SOURCE MsgScriptsTest.cpp USERINCLUDE . -USERINCLUDE ..\inc +USERINCLUDE ../inc MW_LAYER_SYSTEMINCLUDE_SYMBIAN LIBRARY euser.lib efsrv.lib smstestutils.lib diff -r 28ae839b4c09 -r fe71b07a6401 messagingfw/msgtestfw/group/CapUtils.mmp --- a/messagingfw/msgtestfw/group/CapUtils.mmp Tue Feb 02 10:12:21 2010 +0200 +++ b/messagingfw/msgtestfw/group/CapUtils.mmp Fri Feb 19 23:18:09 2010 +0200 @@ -11,7 +11,7 @@ // Contributors: // // Description: -// TestFramework\group\CapUtils.mmp +// TestFramework/group/CapUtils.mmp // // @@ -23,7 +23,7 @@ MW_LAYER_SYSTEMINCLUDE_SYMBIAN -//romtarget \system\bin\ // +//romtarget /system/bin/ // // No ROM target as will go in sis file macro __SECURE_API__ diff -r 28ae839b4c09 -r fe71b07a6401 messagingfw/msgtestfw/group/MessagingTestServerDebug.mmp --- a/messagingfw/msgtestfw/group/MessagingTestServerDebug.mmp Tue Feb 02 10:12:21 2010 +0200 +++ b/messagingfw/msgtestfw/group/MessagingTestServerDebug.mmp Fri Feb 19 23:18:09 2010 +0200 @@ -18,23 +18,23 @@ TARGETTYPE exe UID 0x1000007A 0x101F7774 -USERINCLUDE ..\Framework\inc -USERINCLUDE ..\TestActions\Sample\inc ..\TestActions\Base\inc -USERINCLUDE ..\TestActions\Email\Common\inc ..\TestActions\Email\Imap4\inc ..\TestActions\Email\Pop3\inc ..\TestActions\Email\Smtp\inc -USERINCLUDE ..\TestActions\Sms\inc -USERINCLUDE ..\TestActions\Mms\inc -USERINCLUDE ..\TestActions\Framework\inc -USERINCLUDE ..\TestActionUtils\inc -USERINCLUDE ..\TestActions\Pigeon\inc -USERINCLUDE ..\TestCases\NonScriptedTestCases\inc +USERINCLUDE ../Framework/inc +USERINCLUDE ../TestActions/Sample/inc ../TestActions/Base/inc +USERINCLUDE ../TestActions/Email/Common/inc ../TestActions/Email/Imap4/inc ../TestActions/Email/Pop3/inc ../TestActions/Email/Smtp/inc +USERINCLUDE ../TestActions/Sms/inc +USERINCLUDE ../TestActions/Mms/inc +USERINCLUDE ../TestActions/Framework/inc +USERINCLUDE ../TestActionUtils/inc +USERINCLUDE ../TestActions/Pigeon/inc +USERINCLUDE ../TestCases/NonScriptedTestCases/inc -USERINCLUDE ..\..\msgtests\Framework\server\inc -USERINCLUDE ..\..\watcherfw\inc -USERINCLUDE ..\..\scheduledsendmtm\test\unit\inc +USERINCLUDE ../../msgtests/Framework/server/inc +USERINCLUDE ../../watcherfw/inc +USERINCLUDE ../../scheduledsendmtm/test/unit/inc MW_LAYER_SYSTEMINCLUDE_SYMBIAN -SOURCEPATH ..\Framework\src +SOURCEPATH ../Framework/src SOURCE CMtfTestAction.cpp CMtfTestActionManager.cpp CMtfTestActionWait.cpp SOURCE CMtfTestCase.cpp CMtfTestActionSectionComplete.cpp CMtfTestBeginManager.cpp SOURCE CMtfTestParameterStore.cpp CMtfTestActionNamePair.cpp CMtfTestCaseNamePair.cpp @@ -42,12 +42,12 @@ SOURCE CMtfScriptedTestCase.cpp CMtfTestParameter.cpp CMtfConfigurationType.cpp SOURCE CMtfEnumeratorConverter.cpp CMtfSetConfigurationTestStep.cpp -SOURCEPATH ..\TestActions\Sample\src +SOURCEPATH ../TestActions/Sample/src SOURCE CMtfTestActionSampleActionA.cpp CMtfTestActionSampleActionB.cpp SOURCE CMtfTestActionSampleActionC.cpp CMtfTestActionSampleActionD.cpp SOURCE CMtfTestActionSampleActionE.cpp CMtfTestActionSampleActionF.cpp -SOURCEPATH ..\TestActions\Base\src +SOURCEPATH ../TestActions/Base/src SOURCE CMtfTestActionGetBaseConstants.cpp SOURCE CMtfTestActionGetEntryPriorityEnums.cpp SOURCE CMtfTestActionSleep.cpp @@ -95,14 +95,14 @@ SOURCE CMtfTestActionGetStore.cpp -SOURCEPATH ..\TestActions\Email\Common\src +SOURCEPATH ../TestActions/Email/Common/src SOURCE CMtfTestActionInitNtRas.cpp SOURCE CMtfTestActionGetEmailConstants.cpp SOURCE CMtfTestActionPruneMessages.cpp SOURCE CMtfTestActionStopAllSocketConnections.cpp SOURCE CMtfTestActionLaunchAutoSend.cpp -SOURCEPATH ..\TestActions\Email\Imap4\src +SOURCEPATH ../TestActions/Email/Imap4/src SOURCE CMtfTestActionCreateImap4Service.cpp CMtfTestActionDeleteImap4Service.cpp SOURCE CMtfTestActionCreateImap4Mtm.cpp CMtfTestActionDeleteImap4Mtm.cpp SOURCE CMtfTestActionSetImap4ServiceParameters.cpp @@ -149,13 +149,13 @@ -//ssaging\testframework\TestActionUtils\src -SOURCEPATH ..\TestActionUtils\src +//ssaging/testframework/TestActionUtils/src +SOURCEPATH ../TestActionUtils/src // utility files for setting up service params SOURCE CMtfTestActionUtilsImapScripts.cpp SOURCE CMtfTestActionUtilsPopScripts.cpp -SOURCEPATH ..\TestActions\Email\Pop3\src +SOURCEPATH ../TestActions/Email/Pop3/src SOURCE CMtfTestActionCreatePop3Service.cpp CMtfTestActionDeletePop3Service.cpp SOURCE CMtfTestActionCreatePop3Mtm.cpp CMtfTestActionDeletePop3Mtm.cpp SOURCE CMtfTestActionSetPop3ServiceParameters.cpp @@ -187,7 +187,7 @@ SOURCE CMtfTestActionGetPopAccountSettings.cpp -SOURCEPATH ..\TestActions\Email\Smtp\src +SOURCEPATH ../TestActions/Email/Smtp/src SOURCE CMtfTestActionCreateSmtpService.cpp SOURCE CMtfTestActionDeleteSmtpService.cpp SOURCE CMtfTestActionCreateSmtpMtm.cpp @@ -229,7 +229,7 @@ -SOURCEPATH ..\TestActions\Sms\src +SOURCEPATH ../TestActions/Sms/src SOURCE CMtfTestActionGetSmsConstants.cpp SOURCE CMtfTestActionCreateSmsService.cpp SOURCE CMtfTestActionSetDefaultSmsSettings.cpp @@ -261,13 +261,13 @@ SOURCE CMtfTestActionCompareLastSegmentReport.cpp -//URCEPATH ..\TestActions\Mms\src +//URCEPATH ../TestActions/Mms/src //SOURCE CMtfTestActionCreateMmsService.cpp CMtfTestActionDeleteMmsService.cpp //SOURCE CMtfTestActionCreateMmsMtm.cpp CMtfTestActionDeleteMmsMtm.cpp //SOURCE CMtfTestActionSetMmsServiceParameters.cpp //SOURCE CMtfTestActionCreateMmsMessageFromSmilFile.cpp -SOURCEPATH ..\TestActions\Framework\src +SOURCEPATH ../TestActions/Framework/src SOURCE CMtfTestActionGetEntryTypeConstants.cpp SOURCE CMtfTestActionCreateAttachmentForWrite.cpp SOURCE CMtfTestActionDeleteAttachment.cpp @@ -278,8 +278,8 @@ SOURCE CMtfTestActionFileStoreExists.cpp SOURCE CMtfTestActionReplaceFileStore.cpp -USERINCLUDE ..\TestActions\Base\Attachments\inc -SOURCEPATH ..\TestActions\Base\Attachments\src +USERINCLUDE ../TestActions/Base/Attachments/inc +SOURCEPATH ../TestActions/Base/Attachments/src SOURCE CMtfTestActionAddFileAttachmentByPath.cpp SOURCE CMtfTestActionAddFileAttachmentByPathSync.cpp SOURCE CMtfTestActionAddFileAttachmentByHandle.cpp @@ -311,7 +311,7 @@ SOURCE CMtfTestActionRemoveAllAttachments.cpp SOURCE CMtfTestActionAddAttachmentAsLink.cpp -SOURCEPATH ..\TestActions\Pigeon\src +SOURCEPATH ../TestActions/Pigeon/src SOURCE CMtfTestActionCreatePigeonMessage.cpp SOURCE CMtfTestActionGetPigeonMtmConstant.cpp SOURCE CMtfTestActionSchedulePigeonMessage.cpp @@ -319,19 +319,19 @@ SOURCE CMtfTestActionCheckIfMessageScheduleDateExpired.cpp SOURCE CMtfTestActionLaunchScheduleMessageExe.cpp -USERINCLUDE ..\TestActions\Obex\Ir\inc -SOURCEPATH ..\TestActions\Obex\Ir\src +USERINCLUDE ../TestActions/Obex/Ir/inc +SOURCEPATH ../TestActions/Obex/Ir/src SOURCE CMtfTestActionGetIRMTMUId.cpp SOURCE CMtfTestActionGetIrMTMCommandParameters.cpp -USERINCLUDE ..\TestActions\Obex\Bt\inc -SOURCEPATH ..\TestActions\Obex\Bt\src +USERINCLUDE ../TestActions/Obex/Bt/inc +SOURCEPATH ../TestActions/Obex/Bt/src SOURCE CMtfTestActionGetBTMTMUId.cpp SOURCE CMtfTestActionGetBtMTMCommandParameters.cpp -SOURCEPATH ..\TestActionUtils\src +SOURCEPATH ../TestActionUtils/src SOURCE CMtfTestActionUtilsTimer.cpp CMtfTestActionUtilsDeleteAllChildren.cpp SOURCE CMtfTestActionUtilsConfigFileParser.cpp SOURCE MtfTestActionUtilsUser.cpp @@ -342,7 +342,7 @@ SOURCE CMtfTestActionUtilsEmailMessage.cpp -SOURCEPATH ..\TestCases\NonScriptedTestCases\src +SOURCEPATH ../TestCases/NonScriptedTestCases/src SOURCE CMtfTestCaseSample001.cpp SOURCE CMtfTestCaseCreateSendReceivePop3Email.cpp SOURCE CMtfTestCaseCreateSendReceiveImap4Email.cpp @@ -382,9 +382,9 @@ #ifdef WINS -DEFFILE ..\bwins\wins.def +DEFFILE ../bwins/wins.def #else -DEFFILE ..\bmarm\marm.def +DEFFILE ../bmarm/marm.def #endif VENDORID 0x70000001 diff -r 28ae839b4c09 -r fe71b07a6401 messagingfw/msgtestfw/group/bld.inf --- a/messagingfw/msgtestfw/group/bld.inf Tue Feb 02 10:12:21 2010 +0200 +++ b/messagingfw/msgtestfw/group/bld.inf Fri Feb 19 23:18:09 2010 +0200 @@ -2088,7 +2088,7 @@ ../Configurations/EmailSettings/SmtpSettings-lon-cn-exchng2k_81a.txt /epoc32/wins/c/msgtest/testframework/configurations/emailsettings/smtpsettings-lon-cn-exchng2k_81a.txt ../Configurations/EmailSettings/SmtpSettings-lon-cn-exchng2k_81b.txt /epoc32/wins/c/msgtest/testframework/configurations/emailsettings/smtpsettings-lon-cn-exchng2k_81b.txt ../Configurations/EmailMessage/Email-Simple-Imap4Idle.txt /epoc32/wins/c/msgtest/testframework/configurations/emailmessage/email-simple-imap4idle.txt -//..\Configurations\EmailMessage\2att.txt \epoc32\wins\c\msgtest\TestFramework\Configurations\EmailMessage\2att.txt +//../Configurations/EmailMessage/2att.txt /epoc32/wins/c/msgtest/TestFramework/Configurations/EmailMessage/2att.txt ../Configurations/EmailSettings/Imap4Settings-IdleSupport.txt /epoc32/wins/c/msgtest/testframework/configurations/emailsettings/imap4settings-idlesupport.txt ../Configurations/EmailSettings/Imap4Settings-NoIdleSupport.txt /epoc32/wins/c/msgtest/testframework/configurations/emailsettings/imap4settings-noidlesupport.txt ../Configurations/EmailSettings/SmtpSettings-IdleSupport.txt /epoc32/wins/c/msgtest/testframework/configurations/emailsettings/smtpsettings-idlesupport.txt diff -r 28ae839b4c09 -r fe71b07a6401 messagingfw/msgtestfw/group/mts_attachment.mmp --- a/messagingfw/msgtestfw/group/mts_attachment.mmp Tue Feb 02 10:12:21 2010 +0200 +++ b/messagingfw/msgtestfw/group/mts_attachment.mmp Fri Feb 19 23:18:09 2010 +0200 @@ -18,30 +18,30 @@ UID 0 VENDORID 0x70000001 -USERINCLUDE ..\Framework\inc -USERINCLUDE ..\TestActions\Sample\inc -USERINCLUDE ..\TestActions\Base\inc -USERINCLUDE ..\TestActions\Email\Common\inc -USERINCLUDE ..\TestActions\Email\Imap4\inc -USERINCLUDE ..\TestActions\Email\Pop3\inc -USERINCLUDE ..\TestActions\Email\Smtp\inc -USERINCLUDE ..\TestActions\Sms\inc -USERINCLUDE ..\TestActions\Mms\inc -USERINCLUDE ..\TestActions\Framework\inc -USERINCLUDE ..\TestActionUtils\inc -USERINCLUDE ..\TestActions\Base\Attachments\inc +USERINCLUDE ../Framework/inc +USERINCLUDE ../TestActions/Sample/inc +USERINCLUDE ../TestActions/Base/inc +USERINCLUDE ../TestActions/Email/Common/inc +USERINCLUDE ../TestActions/Email/Imap4/inc +USERINCLUDE ../TestActions/Email/Pop3/inc +USERINCLUDE ../TestActions/Email/Smtp/inc +USERINCLUDE ../TestActions/Sms/inc +USERINCLUDE ../TestActions/Mms/inc +USERINCLUDE ../TestActions/Framework/inc +USERINCLUDE ../TestActionUtils/inc +USERINCLUDE ../TestActions/Base/Attachments/inc -USERINCLUDE ..\TestCases\NonScriptedTestCases\inc +USERINCLUDE ../TestCases/NonScriptedTestCases/inc -USERINCLUDE ..\..\msgtests\Framework\server\inc -USERINCLUDE ..\..\watcherfw\inc +USERINCLUDE ../../msgtests/Framework/server/inc +USERINCLUDE ../../watcherfw/inc -USERINCLUDE ..\..\scheduledsendmtm\test\unit\inc +USERINCLUDE ../../scheduledsendmtm/test/unit/inc MW_LAYER_SYSTEMINCLUDE_SYMBIAN -SOURCEPATH ..\TestActions\Framework\src +SOURCEPATH ../TestActions/Framework/src SOURCE CMtfTestActionGetEntryTypeConstants.cpp SOURCE CMtfTestActionCreateAttachmentForWrite.cpp SOURCE CMtfTestActionDeleteAttachment.cpp @@ -52,7 +52,7 @@ SOURCE CMtfTestActionFileStoreExists.cpp SOURCE CMtfTestActionReplaceFileStore.cpp -SOURCEPATH ..\TestActions\Base\Attachments\src +SOURCEPATH ../TestActions/Base/Attachments/src SOURCE CMtfTestActionAddFileAttachmentByPath.cpp SOURCE CMtfTestActionAddFileAttachmentByPathSync.cpp SOURCE CMtfTestActionAddFileAttachmentByHandle.cpp diff -r 28ae839b4c09 -r fe71b07a6401 messagingfw/msgtestfw/group/mts_base.mmp --- a/messagingfw/msgtestfw/group/mts_base.mmp Tue Feb 02 10:12:21 2010 +0200 +++ b/messagingfw/msgtestfw/group/mts_base.mmp Fri Feb 19 23:18:09 2010 +0200 @@ -20,24 +20,24 @@ VENDORID 0x70000001 -USERINCLUDE ..\Framework\inc -USERINCLUDE ..\TestActions\Sample\inc -USERINCLUDE ..\TestActions\Base\inc -USERINCLUDE ..\TestActions\Base\attachments\inc +USERINCLUDE ../Framework/inc +USERINCLUDE ../TestActions/Sample/inc +USERINCLUDE ../TestActions/Base/inc +USERINCLUDE ../TestActions/Base/attachments/inc -USERINCLUDE ..\TestActions\Email\Common\inc -USERINCLUDE ..\TestActions\Framework\inc -USERINCLUDE ..\TestActionUtils\inc -USERINCLUDE ..\TestActions\Pigeon\inc -USERINCLUDE ..\TestCases\NonScriptedTestCases\inc +USERINCLUDE ../TestActions/Email/Common/inc +USERINCLUDE ../TestActions/Framework/inc +USERINCLUDE ../TestActionUtils/inc +USERINCLUDE ../TestActions/Pigeon/inc +USERINCLUDE ../TestCases/NonScriptedTestCases/inc -USERINCLUDE ..\..\msgtests\Framework\server\inc -USERINCLUDE ..\..\watcherfw\inc -USERINCLUDE ..\..\scheduledsendmtm\test\unit\inc +USERINCLUDE ../../msgtests/Framework/server/inc +USERINCLUDE ../../watcherfw/inc +USERINCLUDE ../../scheduledsendmtm/test/unit/inc MW_LAYER_SYSTEMINCLUDE_SYMBIAN -SOURCEPATH ..\TestActions\Base\src +SOURCEPATH ../TestActions/Base/src SOURCE CMtfTestActionGetBaseConstants.cpp SOURCE CMtfTestActionGetEntryPriorityEnums.cpp SOURCE CMtfTestActionSleep.cpp diff -r 28ae839b4c09 -r fe71b07a6401 messagingfw/msgtestfw/group/mts_email.mmp --- a/messagingfw/msgtestfw/group/mts_email.mmp Tue Feb 02 10:12:21 2010 +0200 +++ b/messagingfw/msgtestfw/group/mts_email.mmp Fri Feb 19 23:18:09 2010 +0200 @@ -21,36 +21,36 @@ -USERINCLUDE ..\Framework\inc -USERINCLUDE ..\TestActions\Sample\inc -USERINCLUDE ..\TestActions\Base\inc -USERINCLUDE ..\TestActions\Email\Common\inc -USERINCLUDE ..\TestActions\Email\Imap4\inc -USERINCLUDE ..\TestActions\Email\Pop3\inc -USERINCLUDE ..\TestActions\Email\Smtp\inc -USERINCLUDE ..\TestActions\Sms\inc -USERINCLUDE ..\TestActions\Mms\inc -USERINCLUDE ..\TestActions\Framework\inc -USERINCLUDE ..\TestActionUtils\inc -USERINCLUDE ..\TestActions\Base\Attachments\inc -USERINCLUDE ..\TestActions\Pigeon\inc -USERINCLUDE ..\TestCases\NonScriptedTestCases\inc +USERINCLUDE ../Framework/inc +USERINCLUDE ../TestActions/Sample/inc +USERINCLUDE ../TestActions/Base/inc +USERINCLUDE ../TestActions/Email/Common/inc +USERINCLUDE ../TestActions/Email/Imap4/inc +USERINCLUDE ../TestActions/Email/Pop3/inc +USERINCLUDE ../TestActions/Email/Smtp/inc +USERINCLUDE ../TestActions/Sms/inc +USERINCLUDE ../TestActions/Mms/inc +USERINCLUDE ../TestActions/Framework/inc +USERINCLUDE ../TestActionUtils/inc +USERINCLUDE ../TestActions/Base/Attachments/inc +USERINCLUDE ../TestActions/Pigeon/inc +USERINCLUDE ../TestCases/NonScriptedTestCases/inc -USERINCLUDE ..\..\msgtests\Framework\server\inc -USERINCLUDE ..\..\watcherfw\inc -USERINCLUDE ..\..\scheduledsendmtm\test\unit\inc +USERINCLUDE ../../msgtests/Framework/server/inc +USERINCLUDE ../../watcherfw/inc +USERINCLUDE ../../scheduledsendmtm/test/unit/inc MW_LAYER_SYSTEMINCLUDE_SYMBIAN -SOURCEPATH ..\TestActions\Email\Common\src +SOURCEPATH ../TestActions/Email/Common/src SOURCE CMtfTestActionInitNtRas.cpp SOURCE CMtfTestActionGetEmailConstants.cpp SOURCE CMtfTestActionPruneMessages.cpp SOURCE CMtfTestActionStopAllSocketConnections.cpp SOURCE CMtfTestActionLaunchAutoSend.cpp -SOURCEPATH ..\TestActions\Email\Imap4\src +SOURCEPATH ../TestActions/Email/Imap4/src SOURCE CMtfTestActionCreateImap4Service.cpp CMtfTestActionDeleteImap4Service.cpp SOURCE CMtfTestActionCreateImap4Mtm.cpp CMtfTestActionDeleteImap4Mtm.cpp SOURCE CMtfTestActionSetImap4ServiceParameters.cpp @@ -97,13 +97,13 @@ -//ssaging\testframework\TestActionUtils\src -SOURCEPATH ..\TestActionUtils\src +//ssaging/testframework/TestActionUtils/src +SOURCEPATH ../TestActionUtils/src // utility files for setting up service params SOURCE CMtfTestActionUtilsImapScripts.cpp SOURCE CMtfTestActionUtilsPopScripts.cpp -SOURCEPATH ..\TestActions\Email\Pop3\src +SOURCEPATH ../TestActions/Email/Pop3/src SOURCE CMtfTestActionCreatePop3Service.cpp CMtfTestActionDeletePop3Service.cpp SOURCE CMtfTestActionCreatePop3Mtm.cpp CMtfTestActionDeletePop3Mtm.cpp SOURCE CMtfTestActionSetPop3ServiceParameters.cpp @@ -135,7 +135,7 @@ SOURCE CMtfTestActionGetPopAccountSettings.cpp -SOURCEPATH ..\TestActions\Email\Smtp\src +SOURCEPATH ../TestActions/Email/Smtp/src SOURCE CMtfTestActionCreateSmtpService.cpp SOURCE CMtfTestActionDeleteSmtpService.cpp SOURCE CMtfTestActionCreateSmtpMtm.cpp diff -r 28ae839b4c09 -r fe71b07a6401 messagingfw/msgtestfw/group/mts_nonscripted_testcase.mmp --- a/messagingfw/msgtestfw/group/mts_nonscripted_testcase.mmp Tue Feb 02 10:12:21 2010 +0200 +++ b/messagingfw/msgtestfw/group/mts_nonscripted_testcase.mmp Fri Feb 19 23:18:09 2010 +0200 @@ -19,29 +19,29 @@ UID 0 VENDORID 0x70000001 -USERINCLUDE ..\Framework\inc -USERINCLUDE ..\TestActions\Sample\inc -USERINCLUDE ..\TestActions\Base\inc -USERINCLUDE ..\TestActions\Email\Common\inc -USERINCLUDE ..\TestActions\Email\Imap4\inc -USERINCLUDE ..\TestActions\Email\Pop3\inc -USERINCLUDE ..\TestActions\Email\Smtp\inc -USERINCLUDE ..\TestActions\Sms\inc -USERINCLUDE ..\TestActions\Mms\inc -USERINCLUDE ..\TestActions\Framework\inc -USERINCLUDE ..\TestActionUtils\inc -USERINCLUDE ..\TestActions\Pigeon\inc -USERINCLUDE ..\TestCases\NonScriptedTestCases\inc +USERINCLUDE ../Framework/inc +USERINCLUDE ../TestActions/Sample/inc +USERINCLUDE ../TestActions/Base/inc +USERINCLUDE ../TestActions/Email/Common/inc +USERINCLUDE ../TestActions/Email/Imap4/inc +USERINCLUDE ../TestActions/Email/Pop3/inc +USERINCLUDE ../TestActions/Email/Smtp/inc +USERINCLUDE ../TestActions/Sms/inc +USERINCLUDE ../TestActions/Mms/inc +USERINCLUDE ../TestActions/Framework/inc +USERINCLUDE ../TestActionUtils/inc +USERINCLUDE ../TestActions/Pigeon/inc +USERINCLUDE ../TestCases/NonScriptedTestCases/inc -USERINCLUDE ..\..\msgtests\Framework\server\inc -USERINCLUDE ..\..\watcherfw\inc -USERINCLUDE ..\..\scheduledsendmtm\test\unit\inc +USERINCLUDE ../../msgtests/Framework/server/inc +USERINCLUDE ../../watcherfw/inc +USERINCLUDE ../../scheduledsendmtm/test/unit/inc MW_LAYER_SYSTEMINCLUDE_SYMBIAN -SOURCEPATH ..\TestCases\NonScriptedTestCases\src +SOURCEPATH ../TestCases/NonScriptedTestCases/src SOURCE CMtfTestCaseSample001.cpp SOURCE CMtfTestCaseCreateSendReceivePop3Email.cpp SOURCE CMtfTestCaseCreateSendReceiveImap4Email.cpp diff -r 28ae839b4c09 -r fe71b07a6401 messagingfw/msgtestfw/group/mts_sample.mmp --- a/messagingfw/msgtestfw/group/mts_sample.mmp Tue Feb 02 10:12:21 2010 +0200 +++ b/messagingfw/msgtestfw/group/mts_sample.mmp Fri Feb 19 23:18:09 2010 +0200 @@ -20,13 +20,13 @@ VENDORID 0x70000001 -USERINCLUDE ..\Framework\inc -USERINCLUDE ..\TestActions\Sample\inc +USERINCLUDE ../Framework/inc +USERINCLUDE ../TestActions/Sample/inc MW_LAYER_SYSTEMINCLUDE_SYMBIAN -SOURCEPATH ..\TestActions\Sample\src +SOURCEPATH ../TestActions/Sample/src SOURCE CMtfTestActionSampleActionA.cpp SOURCE CMtfTestActionSampleActionB.cpp SOURCE CMtfTestActionSampleActionC.cpp diff -r 28ae839b4c09 -r fe71b07a6401 messagingfw/msgtestfw/group/mts_sms_mms.mmp --- a/messagingfw/msgtestfw/group/mts_sms_mms.mmp Tue Feb 02 10:12:21 2010 +0200 +++ b/messagingfw/msgtestfw/group/mts_sms_mms.mmp Fri Feb 19 23:18:09 2010 +0200 @@ -19,17 +19,17 @@ UID 0 VENDORID 0x70000001 -USERINCLUDE ..\Framework\inc -USERINCLUDE ..\TestActions\sms\inc -USERINCLUDE ..\TestActionUtils\inc -USERINCLUDE ..\TestActions\Mms\inc +USERINCLUDE ../Framework/inc +USERINCLUDE ../TestActions/sms/inc +USERINCLUDE ../TestActionUtils/inc +USERINCLUDE ../TestActions/Mms/inc MW_LAYER_SYSTEMINCLUDE_SYMBIAN -SOURCEPATH ..\TestActions\Sms\src +SOURCEPATH ../TestActions/Sms/src SOURCE CMtfTestActionGetSmsConstants.cpp SOURCE CMtfTestActionCreateSmsService.cpp SOURCE CMtfTestActionSetDefaultSmsSettings.cpp @@ -60,7 +60,7 @@ -SOURCEPATH ..\TestActions\Mms\src +SOURCEPATH ../TestActions/Mms/src SOURCE CMtfTestActionCreateMmsService.cpp SOURCE CMtfTestActionDeleteMmsService.cpp SOURCE CMtfTestActionCreateMmsMtm.cpp @@ -71,16 +71,16 @@ -USERINCLUDE ..\TestActions\Obex\Ir\inc -SOURCEPATH ..\TestActions\Obex\Ir\src +USERINCLUDE ../TestActions/Obex/Ir/inc +SOURCEPATH ../TestActions/Obex/Ir/src SOURCE CMtfTestActionGetIRMTMUId.cpp SOURCE CMtfTestActionGetIrMTMCommandParameters.cpp -USERINCLUDE ..\TestActions\Obex\Bt\inc -SOURCEPATH ..\TestActions\Obex\Bt\src +USERINCLUDE ../TestActions/Obex/Bt/inc +SOURCEPATH ../TestActions/Obex/Bt/src SOURCE CMtfTestActionGetBTMTMUId.cpp SOURCE CMtfTestActionGetBtMTMCommandParameters.cpp diff -r 28ae839b4c09 -r fe71b07a6401 messagingfw/msgtestfw/group/mts_utils.mmp --- a/messagingfw/msgtestfw/group/mts_utils.mmp Tue Feb 02 10:12:21 2010 +0200 +++ b/messagingfw/msgtestfw/group/mts_utils.mmp Fri Feb 19 23:18:09 2010 +0200 @@ -18,33 +18,33 @@ UID 0 VENDORID 0x70000001 -USERINCLUDE ..\Framework\inc -USERINCLUDE ..\TestActions\Sample\inc -USERINCLUDE ..\TestActions\Base\inc -USERINCLUDE ..\TestActions\Email\Common\inc -USERINCLUDE ..\TestActions\Email\Imap4\inc -USERINCLUDE ..\TestActions\Email\Pop3\inc -USERINCLUDE ..\TestActions\Email\Smtp\inc -USERINCLUDE ..\TestActions\Sms\inc -USERINCLUDE ..\TestActions\Mms\inc -USERINCLUDE ..\TestActions\Framework\inc -USERINCLUDE ..\TestActionUtils\inc -USERINCLUDE ..\TestActions\Base\Attachments\inc +USERINCLUDE ../Framework/inc +USERINCLUDE ../TestActions/Sample/inc +USERINCLUDE ../TestActions/Base/inc +USERINCLUDE ../TestActions/Email/Common/inc +USERINCLUDE ../TestActions/Email/Imap4/inc +USERINCLUDE ../TestActions/Email/Pop3/inc +USERINCLUDE ../TestActions/Email/Smtp/inc +USERINCLUDE ../TestActions/Sms/inc +USERINCLUDE ../TestActions/Mms/inc +USERINCLUDE ../TestActions/Framework/inc +USERINCLUDE ../TestActionUtils/inc +USERINCLUDE ../TestActions/Base/Attachments/inc -USERINCLUDE ..\TestActions\Pigeon\inc -USERINCLUDE ..\TestCases\NonScriptedTestCases\inc +USERINCLUDE ../TestActions/Pigeon/inc +USERINCLUDE ../TestCases/NonScriptedTestCases/inc -USERINCLUDE ..\..\msgtests\Framework\server\inc -USERINCLUDE ..\..\watcherfw\inc -USERINCLUDE ..\..\scheduledsendmtm\test\unit\inc +USERINCLUDE ../../msgtests/Framework/server/inc +USERINCLUDE ../../watcherfw/inc +USERINCLUDE ../../scheduledsendmtm/test/unit/inc MW_LAYER_SYSTEMINCLUDE_SYMBIAN -SOURCEPATH ..\TestActionUtils\src +SOURCEPATH ../TestActionUtils/src SOURCE CMtfTestActionUtilsTimer.cpp SOURCE CMtfTestActionUtilsDeleteAllChildren.cpp SOURCE CMtfTestActionUtilsConfigFileParser.cpp @@ -59,7 +59,7 @@ -SOURCEPATH ..\TestActions\Pigeon\src +SOURCEPATH ../TestActions/Pigeon/src SOURCE CMtfTestActionCreatePigeonMessage.cpp SOURCE CMtfTestActionGetPigeonMtmConstant.cpp SOURCE CMtfTestActionSchedulePigeonMessage.cpp diff -r 28ae839b4c09 -r fe71b07a6401 messagingfw/msgtestproduct/burtestserver/group/burtestserver.mmp --- a/messagingfw/msgtestproduct/burtestserver/group/burtestserver.mmp Tue Feb 02 10:12:21 2010 +0200 +++ b/messagingfw/msgtestproduct/burtestserver/group/burtestserver.mmp Fri Feb 19 23:18:09 2010 +0200 @@ -22,20 +22,20 @@ CAPABILITY ProtServ AllFiles WriteDeviceData ReadDeviceData // Source: -SOURCEPATH ..\testserver\src +SOURCEPATH ../testserver/src SOURCE t_burtestserver.cpp SOURCE t_storagemanager.cpp SOURCE t_asyncbackuptransferhandler.cpp -SOURCEPATH ..\teststeps\src +SOURCEPATH ../teststeps/src SOURCE t_burteststepbase.cpp SOURCE t_teststepbackup.cpp SOURCE t_teststeprestore.cpp SOURCE t_teststepbackupasync.cpp SOURCE t_teststeprestoreasync.cpp -USERINCLUDE ..\testserver\inc -USERINCLUDE ..\teststeps\inc +USERINCLUDE ../testserver/inc +USERINCLUDE ../teststeps/inc MW_LAYER_SYSTEMINCLUDE_SYMBIAN LIBRARY estlib.lib LIBRARY euser.lib diff -r 28ae839b4c09 -r fe71b07a6401 messagingfw/msgtestproduct/email/imap/group/bld.inf --- a/messagingfw/msgtestproduct/email/imap/group/bld.inf Tue Feb 02 10:12:21 2010 +0200 +++ b/messagingfw/msgtestproduct/email/imap/group/bld.inf Fri Feb 19 23:18:09 2010 +0200 @@ -436,8 +436,8 @@ //required for load Testing ../testdata/EmailMessage/VCards.txt /epoc32/winscw/c/msgtest/config/emailmessage/vcards.txt ../testdata/EmailMessage/DRM_SeparateDelivery01.txt /epoc32/winscw/c/msgtest/config/emailmessage/drm_separatedelivery01.txt -//..\testdata\EmailMessage\test4_mail.txt \epoc32\winscw\c\msgtest\Config\EmailMessage\test4_mail.txt -//..\testdata\EmailMessage\test2_mail.txt \epoc32\winscw\c\msgtest\Config\EmailMessage\test2_mail.txt +//../testdata/EmailMessage/test4_mail.txt /epoc32/winscw/c/msgtest/Config/EmailMessage/test4_mail.txt +//../testdata/EmailMessage/test2_mail.txt /epoc32/winscw/c/msgtest/Config/EmailMessage/test2_mail.txt ../testdata/EmailMessage/simpleemail.txt /epoc32/winscw/c/msgtest/config/emailmessage/simpleemail.txt ../testdata/EmailMessage/mutliattach.txt /epoc32/winscw/c/msgtest/config/emailmessage/mutliattach.txt @@ -450,9 +450,9 @@ ../testdata/EmailMessage/music1mb.txt /epoc32/winscw/c/msgtest/config/emailmessage/music1mb.txt ../testdata/EmailMessage/musicExtraLarge.txt /epoc32/winscw/c/msgtest/config/emailmessage/musicextralarge.txt -//..\testdata\EmailMessage\ccsimpleemail.txt //\epoc32\winscw\c\msgtest\Config\EmailMessage\ccsimpleemail.txt -//..\testdata\EmailMessage\ccsimpleemailmutiattach.txt //\epoc32\winscw\c\msgtest\Config\ccsimpleemailmutiattach.txt -//..\testdata\EmailMessage\ccsimpleemailzeroattach.txt //\epoc32\winscw\c\msgtest\Config\ccsimpleemailzeroattach.txt +//../testdata/EmailMessage/ccsimpleemail.txt ///epoc32/winscw/c/msgtest/Config/EmailMessage/ccsimpleemail.txt +//../testdata/EmailMessage/ccsimpleemailmutiattach.txt ///epoc32/winscw/c/msgtest/Config/ccsimpleemailmutiattach.txt +//../testdata/EmailMessage/ccsimpleemailzeroattach.txt ///epoc32/winscw/c/msgtest/Config/ccsimpleemailzeroattach.txt ../scripts/codenomicon/msg-imap-codenomicon-search.script /epoc32/winscw/c/msgtest/email/imap/codenomicon/msg-imap-codenomicon-search.script ../scripts/codenomicon/msg-imap-codenomicon-rename.script /epoc32/winscw/c/msgtest/email/imap/codenomicon/msg-imap-codenomicon-rename.script diff -r 28ae839b4c09 -r fe71b07a6401 messagingfw/msgtestproduct/email/pop/group/bld.inf --- a/messagingfw/msgtestproduct/email/pop/group/bld.inf Tue Feb 02 10:12:21 2010 +0200 +++ b/messagingfw/msgtestproduct/email/pop/group/bld.inf Fri Feb 19 23:18:09 2010 +0200 @@ -19,7 +19,7 @@ T_PopServer.mmp PRJ_TESTMMPFILES -// makefile ..\..\group\machinename.mak +// makefile ../../group/machinename.mak PRJ_TESTEXPORTS diff -r 28ae839b4c09 -r fe71b07a6401 messagingfw/msgtests/group/bld.inf --- a/messagingfw/msgtests/group/bld.inf Tue Feb 02 10:12:21 2010 +0200 +++ b/messagingfw/msgtests/group/bld.inf Fri Feb 19 23:18:09 2010 +0200 @@ -41,7 +41,7 @@ #ifdef USE_IMAP_V2 #include "../../../../../app/messaging/email/imap4mtm/group/bld.inf" #else -#include "..\..\..\..\..\app\messaging\email\pop3andsmtpmtm\imapservermtm\group\bld.inf" +#include "../../../../../app/messaging/email/pop3andsmtpmtm/imapservermtm/group/bld.inf" #endif #include "../../../../../app/messaging/mobilemessaging/smsmtm/group/bld.inf" #include "../../../../../app/messaging/messagingappbase/obexmtms/Group/bld.inf" diff -r 28ae839b4c09 -r fe71b07a6401 messagingfw/msgurlhandler/test/ui/group/TestHandler.MMP --- a/messagingfw/msgurlhandler/test/ui/group/TestHandler.MMP Tue Feb 02 10:12:21 2010 +0200 +++ b/messagingfw/msgurlhandler/test/ui/group/TestHandler.MMP Fri Feb 19 23:18:09 2010 +0200 @@ -47,6 +47,7 @@ SOURCEPATH . START RESOURCE TestHandler.rss +DEPENDS aknfep.rsg TARGET testhandler.rsc TARGETPATH /resource/apps HEADER @@ -54,12 +55,14 @@ END START RESOURCE TestHandler_loc.rss +DEPENDS aknfep.rsg TARGETPATH resource/apps HEADER LANG SC END START RESOURCE TestHandler_reg.rss +DEPENDS aknfep.rsg TARGETPATH /private/10003a3f/apps END diff -r 28ae839b4c09 -r fe71b07a6401 messagingfw/scheduledsendmtm/test/unit/group/T_schsend1.mmp --- a/messagingfw/scheduledsendmtm/test/unit/group/T_schsend1.mmp Tue Feb 02 10:12:21 2010 +0200 +++ b/messagingfw/scheduledsendmtm/test/unit/group/T_schsend1.mmp Fri Feb 19 23:18:09 2010 +0200 @@ -21,8 +21,8 @@ CAPABILITY All -TCB UID 0x10F03C5E 0x10F03C88 VENDORID 0x70000001 -SOURCEPATH ..\src -userinclude ..\inc +SOURCEPATH ../src +userinclude ../inc MW_LAYER_SYSTEMINCLUDE_SYMBIAN source t_schsend1.cpp library euser.lib diff -r 28ae839b4c09 -r fe71b07a6401 messagingfw/sendas/test/sendastextnotifier/group/sendasUInotifier.mmp --- a/messagingfw/sendas/test/sendastextnotifier/group/sendasUInotifier.mmp Tue Feb 02 10:12:21 2010 +0200 +++ b/messagingfw/sendas/test/sendastextnotifier/group/sendasUInotifier.mmp Fri Feb 19 23:18:09 2010 +0200 @@ -43,6 +43,6 @@ #ifdef WINS DEFFILE ./v2_wins.def #else -DEFFILE .\v2_eabi.def +DEFFILE ./v2_eabi.def #endif SMPSAFE diff -r 28ae839b4c09 -r fe71b07a6401 messagingfw/wappushfw/MiscPushMsgUtils/group/Miscpushmsgutils.mmp --- a/messagingfw/wappushfw/MiscPushMsgUtils/group/Miscpushmsgutils.mmp Tue Feb 02 10:12:21 2010 +0200 +++ b/messagingfw/wappushfw/MiscPushMsgUtils/group/Miscpushmsgutils.mmp Fri Feb 19 23:18:09 2010 +0200 @@ -74,11 +74,11 @@ #else #ifdef WINS - DEFFILE ..\..\BWins\MISCPUSHMSGUTILS.def + DEFFILE ../../BWins/MISCPUSHMSGUTILS.def #elif defined X86GCC DEFFILE ../../bx86gcc/MISCPUSHMSGUTILS.def #else - DEFFILE ..\..\EABI\MISCPUSHMSGUTILS.def + DEFFILE ../../EABI/MISCPUSHMSGUTILS.def #endif #endif // __MESSAGING_API_V2__ diff -r 28ae839b4c09 -r fe71b07a6401 messagingfw/wappushfw/PushMsgEntry/group/Pushmsgentry.mmp --- a/messagingfw/wappushfw/PushMsgEntry/group/Pushmsgentry.mmp Tue Feb 02 10:12:21 2010 +0200 +++ b/messagingfw/wappushfw/PushMsgEntry/group/Pushmsgentry.mmp Fri Feb 19 23:18:09 2010 +0200 @@ -51,7 +51,7 @@ #ifdef WINS DEFFILE ../../bwins/PUSHMSGENTRY.DEF #elif defined(GCC32) - DEFFILE ..\..\BMarm\PUSHMSGENTRY.def + DEFFILE ../../BMarm/PUSHMSGENTRY.def #else DEFFILE ../../eabi/PUSHMSGENTRY.def #endif diff -r 28ae839b4c09 -r fe71b07a6401 messagingfw/wappushfw/SISLPushMsgUtils/group/SISLPushMsgUtils.mmp --- a/messagingfw/wappushfw/SISLPushMsgUtils/group/SISLPushMsgUtils.mmp Tue Feb 02 10:12:21 2010 +0200 +++ b/messagingfw/wappushfw/SISLPushMsgUtils/group/SISLPushMsgUtils.mmp Fri Feb 19 23:18:09 2010 +0200 @@ -51,7 +51,7 @@ #ifdef WINS DEFFILE ../../bwins/SISLPUSHMSGUTILS.DEF #elif defined(GCC32) - DEFFILE ..\..\BMarm\SISLPUSHMSGUTILS.def + DEFFILE ../../BMarm/SISLPUSHMSGUTILS.def #else DEFFILE ../../eabi/SISLPUSHMSGUTILS.def #endif diff -r 28ae839b4c09 -r fe71b07a6401 messagingfw/wappushfw/examples/PushAppHandlerEx/BLD.INF --- a/messagingfw/wappushfw/examples/PushAppHandlerEx/BLD.INF Tue Feb 02 10:12:21 2010 +0200 +++ b/messagingfw/wappushfw/examples/PushAppHandlerEx/BLD.INF Fri Feb 19 23:18:09 2010 +0200 @@ -26,13 +26,13 @@ PRJ_EXPORTS PRJ_MMPFILES -.\PushAppHandlerEx.mmp +./PushAppHandlerEx.mmp PRJ_TESTMMPFILES -\Wap-Browser\wappush\tpush\DummyStack\Dummywapstack.mmp -.\Test\t_push.mmp +/Wap-Browser/wappush/tpush/DummyStack/Dummywapstack.mmp +./Test/t_push.mmp PRJ_TESTEXPORTS -.\test\pushtestcases.ini \epoc32\wins\c\pushtestcases.ini +./test/pushtestcases.ini /epoc32/wins/c/pushtestcases.ini diff -r 28ae839b4c09 -r fe71b07a6401 messagingfw/wappushfw/examples/PushAppHandlerEx/PushAppHandlerEx.mmp --- a/messagingfw/wappushfw/examples/PushAppHandlerEx/PushAppHandlerEx.mmp Tue Feb 02 10:12:21 2010 +0200 +++ b/messagingfw/wappushfw/examples/PushAppHandlerEx/PushAppHandlerEx.mmp Fri Feb 19 23:18:09 2010 +0200 @@ -21,13 +21,13 @@ UID 0x10009D8D 0x101F3E60 // <-----TODO...Match to same UID resource file VENDORID 0x70000001 -SOURCEPATH ..\PushAppHandlerEx +SOURCEPATH ../PushAppHandlerEx SOURCE PushAppHandlerEx.cpp SOURCE PushAppHandlerExGroupProxy.cpp SOURCE PushAppHandlerExMain.cpp -USERINCLUDE .\. +USERINCLUDE ./. MW_LAYER_SYSTEMINCLUDE_SYMBIAN LIBRARY euser.lib ECom.lib WapPushUtils.lib diff -r 28ae839b4c09 -r fe71b07a6401 messagingfw/wappushfw/examples/PushAppHandlerEx/test/t_push.mmp --- a/messagingfw/wappushfw/examples/PushAppHandlerEx/test/t_push.mmp Tue Feb 02 10:12:21 2010 +0200 +++ b/messagingfw/wappushfw/examples/PushAppHandlerEx/test/t_push.mmp Fri Feb 19 23:18:09 2010 +0200 @@ -19,21 +19,21 @@ TARGETTYPE EXE CAPABILITY ReadDeviceData WriteDeviceData NetworkServices LocalServices ReadUserData WriteUserData -USERINCLUDE .\. -USERINCLUDE \wap-browser\wappush\tpush\dummystack -USERINCLUDE \wap-browser\wappush\Plugins\inc -USERINCLUDE \wap-browser\wappush\pushutils\inc -USERINCLUDE \wap-browser\wappush\pushwatcher\inc +USERINCLUDE ./. +USERINCLUDE /wap-browser/wappush/tpush/dummystack +USERINCLUDE /wap-browser/wappush/Plugins/inc +USERINCLUDE /wap-browser/wappush/pushutils/inc +USERINCLUDE /wap-browser/wappush/pushwatcher/inc MW_LAYER_SYSTEMINCLUDE_SYMBIAN -SOURCEPATH .\. +SOURCEPATH ./. SOURCE t_baseMessage.cpp Wappushmsggen.cpp SOURCE t_WapPush.cpp SOURCE t_ScriptTest.cpp SOURCE t_serviceutils.cpp -SOURCEPATH \wap-browser\WapPush\PushWatcher\src +SOURCEPATH /wap-browser/WapPush/PushWatcher/src SOURCE CLWatcher.cpp ConnMan.cpp -USERINCLUDE ..\test\t_utils -SOURCEPATH ..\test\t_utils +USERINCLUDE ../test/t_utils +SOURCEPATH ../test/t_utils SOURCE ScriptFile.cpp ScriptSection.cpp ScriptSectionItem.cpp LIBRARY euser.lib dummywapstack.lib flogger.lib wappushutils.lib ECom.lib diff -r 28ae839b4c09 -r fe71b07a6401 messagingfw/wappushfw/group/BLD.INF --- a/messagingfw/wappushfw/group/BLD.INF Tue Feb 02 10:12:21 2010 +0200 +++ b/messagingfw/wappushfw/group/BLD.INF Fri Feb 19 23:18:09 2010 +0200 @@ -26,7 +26,7 @@ // specify the source file followed by its destination here // copy will be used to copy the source file to its destination // If there's no destination then the source file will be copied -// to the same name in \epoc32\include +// to the same name in /epoc32/include PRJ_PLATFORMS DEFAULT diff -r 28ae839b4c09 -r fe71b07a6401 messagingfw/wappushfw/plugins/group/Sl1_0StringDict00.mmp --- a/messagingfw/wappushfw/plugins/group/Sl1_0StringDict00.mmp Tue Feb 02 10:12:21 2010 +0200 +++ b/messagingfw/wappushfw/plugins/group/Sl1_0StringDict00.mmp Fri Feb 19 23:18:09 2010 +0200 @@ -29,9 +29,9 @@ VENDORID 0x70000001 MW_LAYER_SYSTEMINCLUDE_SYMBIAN -// USERINCLUDE +\build\generated\wappush\Plugins\StringDictionaries +// USERINCLUDE +/build/generated/wappush/Plugins/StringDictionaries -//SOURCEPATH +\build\generated\wappush\Plugins\StringDictionaries +//SOURCEPATH +/build/generated/wappush/Plugins/StringDictionaries START STRINGTABLE ../../plugins/StringDictionaries/ServiceLoading/Sl1_0StringDict00TagTable.st diff -r 28ae839b4c09 -r fe71b07a6401 messagingfw/wappushfw/pushmtm/group/pushmtmclientserver.mmp --- a/messagingfw/wappushfw/pushmtm/group/pushmtmclientserver.mmp Tue Feb 02 10:12:21 2010 +0200 +++ b/messagingfw/wappushfw/pushmtm/group/pushmtmclientserver.mmp Fri Feb 19 23:18:09 2010 +0200 @@ -38,7 +38,7 @@ #ifdef WINS DEFFILE ../../bwins/PUSHMTMCLIENTSERVER.DEF #elif defined(GCC32) -DEFFILE ..\..\BMarm\PushMtmClientServer.def +DEFFILE ../../BMarm/PushMtmClientServer.def #else DEFFILE ../../eabi/PushMtmClientServer.def #endif diff -r 28ae839b4c09 -r fe71b07a6401 messagingfw/wappushfw/pushmtm/test/t_pushmtm.mmp --- a/messagingfw/wappushfw/pushmtm/test/t_pushmtm.mmp Tue Feb 02 10:12:21 2010 +0200 +++ b/messagingfw/wappushfw/pushmtm/test/t_pushmtm.mmp Fri Feb 19 23:18:09 2010 +0200 @@ -17,13 +17,13 @@ TARGETTYPE EXE CAPABILITY readdevicedata writedevicedata protserv networkcontrol networkservices localservices readuserdata -USERINCLUDE .\. ..\inc -USERINCLUDE ..\..\PUSHUTILS\INC ..\..\pushutils\test +USERINCLUDE ./. ../inc +USERINCLUDE ../../PUSHUTILS/INC ../../pushutils/test MW_LAYER_SYSTEMINCLUDE_SYMBIAN -SOURCEPATH .\. ..\src -SOURCEPATH ..\..\pushutils\test +SOURCEPATH ./. ../src +SOURCEPATH ../../pushutils/test SOURCE t_serviceutils.cpp -SOURCEPATH ..\..\Pushmtm\Test +SOURCEPATH ../../Pushmtm/Test SOURCE t_Pushmtm.cpp diff -r 28ae839b4c09 -r fe71b07a6401 messagingfw/wappushfw/pushutils/group/pushutils.mmp --- a/messagingfw/wappushfw/pushutils/group/pushutils.mmp Tue Feb 02 10:12:21 2010 +0200 +++ b/messagingfw/wappushfw/pushutils/group/pushutils.mmp Fri Feb 19 23:18:09 2010 +0200 @@ -50,7 +50,7 @@ #ifdef WINS DEFFILE ../../bwins/WAPPUSHUTILS.DEF #elif defined(GCC32) -DEFFILE ..\..\BMarm\WapPushUtils.def +DEFFILE ../../BMarm/WapPushUtils.def #else DEFFILE ../../eabi/WapPushUtils.def #endif diff -r 28ae839b4c09 -r fe71b07a6401 messagingfw/wappushfw/pushutils/test/t_failure.mmp --- a/messagingfw/wappushfw/pushutils/test/t_failure.mmp Tue Feb 02 10:12:21 2010 +0200 +++ b/messagingfw/wappushfw/pushutils/test/t_failure.mmp Fri Feb 19 23:18:09 2010 +0200 @@ -21,7 +21,7 @@ USERINCLUDE ../../pushwatcher/test USERINCLUDE ../../plugins/inc MW_LAYER_SYSTEMINCLUDE_SYMBIAN -SOURCEPATH ./. ..\src +SOURCEPATH ./. ../src SOURCE t_failure.cpp SOURCEPATH ../../pushwatcher/test SOURCE pushlog.cpp diff -r 28ae839b4c09 -r fe71b07a6401 messagingfw/wappushfw/pushutils/test/t_filter.mmp --- a/messagingfw/wappushfw/pushutils/test/t_filter.mmp Tue Feb 02 10:12:21 2010 +0200 +++ b/messagingfw/wappushfw/pushutils/test/t_filter.mmp Fri Feb 19 23:18:09 2010 +0200 @@ -19,11 +19,11 @@ TARGETTYPE EXE CAPABILITY ALL -TCB -USERINCLUDE . ..\inc +USERINCLUDE . ../inc MW_LAYER_SYSTEMINCLUDE_SYMBIAN -SOURCEPATH .\. +SOURCEPATH ./. SOURCE t_filter.cpp -SOURCEPATH ..\..\PushUtils\Test +SOURCEPATH ../../PushUtils/Test LIBRARY euser.lib pi.lib WapPushUtils.lib VENDORID 0x70000001 diff -r 28ae839b4c09 -r fe71b07a6401 messagingfw/wappushfw/pushwatcher/group/pushwatcher.mmp --- a/messagingfw/wappushfw/pushwatcher/group/pushwatcher.mmp Tue Feb 02 10:12:21 2010 +0200 +++ b/messagingfw/wappushfw/pushwatcher/group/pushwatcher.mmp Fri Feb 19 23:18:09 2010 +0200 @@ -35,7 +35,7 @@ #endif end #else -TARGETPATH \system\libs\watchers +TARGETPATH /system/libs/watchers TARGETTYPE dll UID 0x1027433D 0x10009145 @@ -66,11 +66,11 @@ #ifndef __WATCHER_API_V2__ #ifdef WINS -DEFFILE ..\..\BWins\WapPushW.def +DEFFILE ../../BWins/WapPushW.def #elif defined(GCC32) -DEFFILE ..\..\BMarm\WapPushM.def +DEFFILE ../../BMarm/WapPushM.def #else -DEFFILE ..\..\EABI\WapPush.def +DEFFILE ../../EABI/WapPush.def #endif #endif // __WATCHER_API_V2__ diff -r 28ae839b4c09 -r fe71b07a6401 messagingfw/wappushfw/tpush/DummyStack/Dummywapstack.mmp --- a/messagingfw/wappushfw/tpush/DummyStack/Dummywapstack.mmp Tue Feb 02 10:12:21 2010 +0200 +++ b/messagingfw/wappushfw/tpush/DummyStack/Dummywapstack.mmp Fri Feb 19 23:18:09 2010 +0200 @@ -28,7 +28,7 @@ #ifdef WINS DEFFILE ../../bwins/dummywapstack.def #elif defined(GCC32) - DEFFILE ..\..\BMarm\DummyWapStack.def + DEFFILE ../../BMarm/DummyWapStack.def #else DEFFILE ../../EABI/DummyWapStack.def #endif diff -r 28ae839b4c09 -r fe71b07a6401 messagingfw/wappushfw/tpush/t_pushmsggen.mmp --- a/messagingfw/wappushfw/tpush/t_pushmsggen.mmp Tue Feb 02 10:12:21 2010 +0200 +++ b/messagingfw/wappushfw/tpush/t_pushmsggen.mmp Fri Feb 19 23:18:09 2010 +0200 @@ -16,7 +16,7 @@ TARGET t_pushmsggen.exe TARGETTYPE exe CAPABILITY readdevicedata writedevicedata protserv networkcontrol networkservices localservices readuserdata -SOURCEPATH ..\tpush +SOURCEPATH ../tpush SOURCE t_pushmsggen.cpp wappushmsggen.cpp MW_LAYER_SYSTEMINCLUDE_SYMBIAN LIBRARY euser.lib diff -r 28ae839b4c09 -r fe71b07a6401 messagingfw/watcherfw/test/group/ecomtestwatcher.mmp --- a/messagingfw/watcherfw/test/group/ecomtestwatcher.mmp Tue Feb 02 10:12:21 2010 +0200 +++ b/messagingfw/watcherfw/test/group/ecomtestwatcher.mmp Fri Feb 19 23:18:09 2010 +0200 @@ -22,13 +22,13 @@ CAPABILITY All -TCB VENDORID 0x70000001 -USERINCLUDE ..\inc -SOURCEPATH ..\src +USERINCLUDE ../inc +SOURCEPATH ../src SOURCE testwatcher.cpp MW_LAYER_SYSTEMINCLUDE_SYMBIAN LIBRARY euser.lib watcher.lib efsrv.lib ecom.lib -SOURCEPATH ..\src +SOURCEPATH ../src start resource 10204280.rss TARGET ecomtestwatcher.rsc diff -r 28ae839b4c09 -r fe71b07a6401 messagingfw/watcherfw/test/group/t_forever.mmp --- a/messagingfw/watcherfw/test/group/t_forever.mmp Tue Feb 02 10:12:21 2010 +0200 +++ b/messagingfw/watcherfw/test/group/t_forever.mmp Fri Feb 19 23:18:09 2010 +0200 @@ -18,8 +18,8 @@ TARGETTYPE exe CAPABILITY All -TCB -USERINCLUDE ..\..\inc -SOURCEPATH ..\src +USERINCLUDE ../../inc +SOURCEPATH ../src SOURCE t_forever.cpp MW_LAYER_SYSTEMINCLUDE_SYMBIAN LIBRARY euser.lib watcher.lib diff -r 28ae839b4c09 -r fe71b07a6401 messagingfw/watcherfw/test/group/t_watcher.mmp --- a/messagingfw/watcherfw/test/group/t_watcher.mmp Tue Feb 02 10:12:21 2010 +0200 +++ b/messagingfw/watcherfw/test/group/t_watcher.mmp Fri Feb 19 23:18:09 2010 +0200 @@ -18,8 +18,8 @@ TARGETTYPE exe CAPABILITY All -TCB -USERINCLUDE ..\..\inc -SOURCEPATH ..\src +USERINCLUDE ../../inc +SOURCEPATH ../src SOURCE t_watcher.cpp MW_LAYER_SYSTEMINCLUDE_SYMBIAN LIBRARY euser.lib watcher.lib msvtestutils.lib efsrv.lib bafl.lib diff -r 28ae839b4c09 -r fe71b07a6401 messagingfw/watcherfw/test/group/testwatcher.mmp --- a/messagingfw/watcherfw/test/group/testwatcher.mmp Tue Feb 02 10:12:21 2010 +0200 +++ b/messagingfw/watcherfw/test/group/testwatcher.mmp Fri Feb 19 23:18:09 2010 +0200 @@ -14,7 +14,7 @@ // TARGET testwatcher.dll -TARGETPATH \system\libs\watchers +TARGETPATH /system/libs/watchers TARGETTYPE dll UID 0x10006554 0x10008D9D @@ -22,8 +22,8 @@ CAPABILITY All -TCB VENDORID 0x70000001 -USERINCLUDE ..\inc -SOURCEPATH ..\src +USERINCLUDE ../inc +SOURCEPATH ../src SOURCE testwatcher.cpp MW_LAYER_SYSTEMINCLUDE_SYMBIAN LIBRARY euser.lib watcher.lib efsrv.lib