--- a/commsconfig/commsdatabaseshim/group/BLD.INF Fri May 14 17:04:36 2010 +0300
+++ b/commsconfig/commsdatabaseshim/group/BLD.INF Thu May 27 14:07:49 2010 +0300
@@ -19,7 +19,7 @@
@file
*/
-#include "../commdbshim/group/BLD.INF"
+#include "../commdbshim/group/bld.inf"
PRJ_PLATFORMS
--- a/commsfwsupport/commselements/group/bld.inf Fri May 14 17:04:36 2010 +0300
+++ b/commsfwsupport/commselements/group/bld.inf Thu May 27 14:07:49 2010 +0300
@@ -41,7 +41,7 @@
//COMMS SPECIFIC OR NOT YET PRODUCTISED ELEMENTS
#include "../MsgParser/group/bld.inf"
-#include "../NetSubscribe/group/BLD.INF"
+#include "../NetSubscribe/group/bld.inf"
PRJ_EXPORTS
--- a/commsfwsupport/commselements/testing/ElementServer/group/bld.inf Fri May 14 17:04:36 2010 +0300
+++ b/commsfwsupport/commselements/testing/ElementServer/group/bld.inf Thu May 27 14:07:49 2010 +0300
@@ -26,8 +26,8 @@
PRJ_TESTEXPORTS
-../scripts/TE_StateMachine.script z:/testdata/scripts/StateMachine/TE_StateMachine.script
-../configs/StateMachine.ini z:/testdata/configs/StateMachine/StateMachine.ini
+../scripts/TE_StateMachine.script z:/testdata/scripts/statemachine/te_statemachine.script
+../configs/StateMachine.ini z:/testdata/configs/statemachine/statemachine.ini
./Te_ElementServer.iby /epoc32/rom/include/te_elementserver.iby
PRJ_TESTMMPFILES
--- a/commsfwtools/commstools/group/bld.inf Fri May 14 17:04:36 2010 +0300
+++ b/commsfwtools/commstools/group/bld.inf Thu May 27 14:07:49 2010 +0300
@@ -23,7 +23,7 @@
../svg/messagesequencetool.doc /epoc32/tools/commsfw/messagesequencetool.doc
../svg/relations.pl /epoc32/tools/commsfw/relations.pl
../svg/relationships.txt /epoc32/tools/commsfw/relationships.txt
-../svg/relationsvrml.pl /epoc32/tools/commsfw/relationsvrml.pl
+../svg/relationsVrml.pl /epoc32/tools/commsfw/relationsvrml.pl
../svg/parse.ini /epoc32/tools/commsfw/parse.ini
../svg/parseit.bat /epoc32/tools/commsfw/parseit.bat
../svg/parselog.pl /epoc32/tools/commsfw/parselog.pl
--- a/commsfwtools/preparedefaultcommsdatabase/group/BLD.INF Fri May 14 17:04:36 2010 +0300
+++ b/commsfwtools/preparedefaultcommsdatabase/group/BLD.INF Thu May 27 14:07:49 2010 +0300
@@ -21,9 +21,9 @@
/**
@file
*/
- #include "../Tools/ced/group/BLD.INF"
- #include "../Tools/ceddump/group/BLD.INF"
- #include "../Tools/cfg2xml/group/BLD.INF"
+ #include "../Tools/ced/group/bld.inf"
+ #include "../Tools/ceddump/group/bld.inf"
+ #include "../Tools/cfg2xml/group/bld.inf"
//making default file for the central repository
//#include "../defaultcommdb/group/bld.inf"
@@ -46,8 +46,8 @@
../inc/commsdat_partner.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(commsdat_partner.h)
../inc/metadatabase_partner.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(metadatabase_partner.h)
../inc/commsdattypesv1_1_partner.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(commsdattypesv1_1_partner.h)
-../inc/commsdattypesv1_1_internal.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(commsdattypesv1_1_internal.h)
-../inc/Commsdattypeinfov1_1_internal.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(commsdattypeinfov1_1_internal.h)
+../inc/commsdattypesv1_1_internal.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(commsdattypesv1_1_internal.h)
+../inc/commsdattypeinfov1_1_internal.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(commsdattypeinfov1_1_internal.h)
PRJ_TESTEXPORTS
--- a/commsfwutils/commsbufs/group/bld.inf Fri May 14 17:04:36 2010 +0300
+++ b/commsfwutils/commsbufs/group/bld.inf Thu May 27 14:07:49 2010 +0300
@@ -51,10 +51,10 @@
../mbufmgr/inc/mbufpktq.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(comms-infras/mbufpktq.h)
../mbufmgr/inc/mbufpktq.inl SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(comms-infras/mbufpktq.inl)
../mbufmgr/inc/mbufasyncrequest.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(comms-infras/mbufasyncrequest.h)
-../mbufmgr/inc/mbufpanic.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(comms-infras/mbufpanic.h)
+../mbufmgr/inc/MBufPanic.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(comms-infras/mbufpanic.h)
../mbufmgr/inc/nifmbuf.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(nifmbuf.h)
../mbufmgr/inc/mb_thread.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(mb_thread.h)
-../mbufmgrimpl/inc/es_mbman.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(es_mbman.h)
+../mbufmgrimpl/inc/ES_MBMAN.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(es_mbman.h)
PRJ_TESTEXPORTS
--- a/commsfwutils/commsbufs/group/mbufmgrimpl.mmp Fri May 14 17:04:36 2010 +0300
+++ b/commsfwutils/commsbufs/group/mbufmgrimpl.mmp Thu May 27 14:07:49 2010 +0300
@@ -37,12 +37,12 @@
SOURCEPATH ../mbufmgrimpl/src
-SOURCE mb_man.cpp
-SOURCE mb_timer.CPP
-SOURCE mbufmemoryallocator.cpp
-SOURCE mbufmemorymanager.cpp
-SOURCE mbufpoolchain.cpp
-SOURCE mbufpoolmanager.cpp
+SOURCE MB_MAN.CPP
+SOURCE Mb_timer.CPP
+SOURCE MBufMemoryAllocator.cpp
+SOURCE MBufMemoryManager.cpp
+SOURCE MBufPoolChain.cpp
+SOURCE MBufPoolManager.cpp
USERINCLUDE ../inc
USERINCLUDE ../mbufmgrimpl/inc
--- a/datacommsserver/esockserver/group/BLD.INF Fri May 14 17:04:36 2010 +0300
+++ b/datacommsserver/esockserver/group/BLD.INF Thu May 27 14:07:49 2010 +0300
@@ -206,7 +206,7 @@
../inc/ss_mobility_apiext_internal.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(comms-infras/ss_mobility_apiext_internal.h)
../inc/ss_refcountowner.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(comms-infras/ss_refcountowner.h)
-#include "../etc/BLD.INF"
+#include "../etc/bld.inf"
#include "../compatibility_headers/group/bld.inf"
//Backup and restore exports
--- a/datacommsserver/esockserver/test/TE_DummyProvider/group/bld.inf Fri May 14 17:04:36 2010 +0300
+++ b/datacommsserver/esockserver/test/TE_DummyProvider/group/bld.inf Thu May 27 14:07:49 2010 +0300
@@ -28,7 +28,7 @@
../scripts/te_dummyprovider_004.script z:/testdata/scripts/te_dummyprovider_004.script
../scripts/te_dummyprovider_005.script z:/testdata/scripts/te_dummyprovider_005.script
-../scripts/te_dummyprovider_incomingSCPR.script z:/testdata/scripts/te_dummyprovider_incomingSCPR.script
+../scripts/te_dummyprovider_incomingSCPR.script z:/testdata/scripts/te_dummyprovider_incomingscpr.script
../configs/te_dummyproviders.cfg z:/testdata/configs/te_dummyproviders.cfg
../configs/te_dummyprovider_001.ini z:/testdata/configs/te_dummyprovider_001.ini
../configs/te_dummyprovider_002.ini z:/testdata/configs/te_dummyprovider_002.ini
--- a/datacommsserver/esockserver/test/TE_RConnection/group/bld.inf Fri May 14 17:04:36 2010 +0300
+++ b/datacommsserver/esockserver/test/TE_RConnection/group/bld.inf Thu May 27 14:07:49 2010 +0300
@@ -169,8 +169,8 @@
// CED
../configs/Mobility/BearerMobility_001.ced.cfg z:/testdata/configs/bearermobility/bearermobility_001.ced.cfg
-../configs/Mobility/BearerMobility_DummyProviders_002.ced.cfg z:/testdata/configs/bearermobility/BearerMobility_DummyProviders_002.ced.cfg
-../configs/Mobility/BearerMobility_DummyProviders_003.ced.cfg z:/testdata/configs/bearermobility/BearerMobility_DummyProviders_003.ced.cfg
+../configs/Mobility/BearerMobility_DummyProviders_002.ced.cfg z:/testdata/configs/bearermobility/bearermobility_dummyproviders_002.ced.cfg
+../configs/Mobility/BearerMobility_DummyProviders_003.ced.cfg z:/testdata/configs/bearermobility/bearermobility_dummyproviders_003.ced.cfg
// Configs
../configs/Mobility/Mobility_760600.ini z:/testdata/configs/bearermobility/mobility_760600.ini
--- a/datacommsserver/esockserver/test/TE_RSubconnection/group/bld.inf Fri May 14 17:04:36 2010 +0300
+++ b/datacommsserver/esockserver/test/TE_RSubconnection/group/bld.inf Thu May 27 14:07:49 2010 +0300
@@ -20,7 +20,7 @@
// If you change this(to xml format for example), remember to update te_cap_rsubconn.script
../configs/te_RSubConnection_Mesh.cfg z:/testdata/configs/te_rsubconnection_mesh.cfg
../configs/te_RSubConnection_LoopbackCsy.ini z:/testdata/configs/te_rsubconnection_loopbackcsy.ini
-../configs/te_RSubConnection_Simtsy.txt z:/testdata/configs/te_rsubconnection_simtsy.txt
+../configs/te_RSubConnection_simtsy.txt z:/testdata/configs/te_rsubconnection_simtsy.txt
../scripts/te_RSubConnectionSuite.script z:/testdata/scripts/te_rsubconnectionsuite.script
../scripts/te_RSubConnectionQoSRemovedSuite.script z:/testdata/scripts/te_rsubconnectionqosremovedsuite.script
--- a/datacommsserver/esockserver/test/TS_MultiHoming/group/bld.inf Fri May 14 17:04:36 2010 +0300
+++ b/datacommsserver/esockserver/test/TS_MultiHoming/group/bld.inf Thu May 27 14:07:49 2010 +0300
@@ -289,25 +289,25 @@
../ScriptFiles/TS_MultiHoming_Test7.ini /epoc32/release/wins/udeb/z/testdata/configs/ts_multihoming_test7.ini
../ScriptFiles/TS_MultiHoming_Test7.ini /epoc32/release/winscw/udeb/z/testdata/configs/ts_multihoming_test7.ini
-../ScriptFiles/TS_MultiHoming_Test7a.ini /epoc32/data/z/testdata/configs/ts_multihoming_test7a.ini
-../ScriptFiles/TS_MultiHoming_Test7a.ini /epoc32/release/wins/udeb/z/testdata/configs/ts_multihoming_test7a.ini
-../ScriptFiles/TS_MultiHoming_Test7a.ini /epoc32/release/winscw/udeb/z/testdata/configs/ts_multihoming_test7a.ini
+../ScriptFiles/ts_multihoming_test7a.ini /epoc32/data/z/testdata/configs/ts_multihoming_test7a.ini
+../ScriptFiles/ts_multihoming_test7a.ini /epoc32/release/wins/udeb/z/testdata/configs/ts_multihoming_test7a.ini
+../ScriptFiles/ts_multihoming_test7a.ini /epoc32/release/winscw/udeb/z/testdata/configs/ts_multihoming_test7a.ini
-../ScriptFiles/TS_MultiHoming_Test7b.ini /epoc32/data/z/testdata/configs/ts_multihoming_test7b.ini
-../ScriptFiles/TS_MultiHoming_Test7b.ini /epoc32/release/wins/udeb/z/testdata/configs/ts_multihoming_test7b.ini
-../ScriptFiles/TS_MultiHoming_Test7b.ini /epoc32/release/winscw/udeb/z/testdata/configs/ts_multihoming_test7b.ini
+../ScriptFiles/ts_multihoming_test7b.ini /epoc32/data/z/testdata/configs/ts_multihoming_test7b.ini
+../ScriptFiles/ts_multihoming_test7b.ini /epoc32/release/wins/udeb/z/testdata/configs/ts_multihoming_test7b.ini
+../ScriptFiles/ts_multihoming_test7b.ini /epoc32/release/winscw/udeb/z/testdata/configs/ts_multihoming_test7b.ini
-../ScriptFiles/TS_MultiHoming_Test7c.ini /epoc32/data/z/testdata/configs/ts_multihoming_test7c.ini
-../ScriptFiles/TS_MultiHoming_Test7c.ini /epoc32/release/wins/udeb/z/testdata/configs/ts_multihoming_test7c.ini
-../ScriptFiles/TS_MultiHoming_Test7c.ini /epoc32/release/winscw/udeb/z/testdata/configs/ts_multihoming_test7c.ini
+../ScriptFiles/ts_multihoming_test7c.ini /epoc32/data/z/testdata/configs/ts_multihoming_test7c.ini
+../ScriptFiles/ts_multihoming_test7c.ini /epoc32/release/wins/udeb/z/testdata/configs/ts_multihoming_test7c.ini
+../ScriptFiles/ts_multihoming_test7c.ini /epoc32/release/winscw/udeb/z/testdata/configs/ts_multihoming_test7c.ini
-../ScriptFiles/TS_MultiHoming_Test7d.ini /epoc32/data/z/testdata/configs/ts_multihoming_test7d.ini
-../ScriptFiles/TS_MultiHoming_Test7d.ini /epoc32/release/wins/udeb/z/testdata/configs/ts_multihoming_test7d.ini
-../ScriptFiles/TS_MultiHoming_Test7d.ini /epoc32/release/winscw/udeb/z/testdata/configs/ts_multihoming_test7d.ini
+../ScriptFiles/ts_multihoming_test7d.ini /epoc32/data/z/testdata/configs/ts_multihoming_test7d.ini
+../ScriptFiles/ts_multihoming_test7d.ini /epoc32/release/wins/udeb/z/testdata/configs/ts_multihoming_test7d.ini
+../ScriptFiles/ts_multihoming_test7d.ini /epoc32/release/winscw/udeb/z/testdata/configs/ts_multihoming_test7d.ini
-../ScriptFiles/TS_MultiHoming_Test7e.ini /epoc32/data/z/testdata/configs/ts_multihoming_test7e.ini
-../ScriptFiles/TS_MultiHoming_Test7e.ini /epoc32/release/wins/udeb/z/testdata/configs/ts_multihoming_test7e.ini
-../ScriptFiles/TS_MultiHoming_Test7e.ini /epoc32/release/winscw/udeb/z/testdata/configs/ts_multihoming_test7e.ini
+../ScriptFiles/ts_multihoming_test7e.ini /epoc32/data/z/testdata/configs/ts_multihoming_test7e.ini
+../ScriptFiles/ts_multihoming_test7e.ini /epoc32/release/wins/udeb/z/testdata/configs/ts_multihoming_test7e.ini
+../ScriptFiles/ts_multihoming_test7e.ini /epoc32/release/winscw/udeb/z/testdata/configs/ts_multihoming_test7e.ini
../ScriptFiles/TS_MultiHoming_Test7.script /epoc32/data/z/testdata/scripts/ts_multihoming_test7.script
--- a/datacommsserver/networkingdialogapi/TE_Dialog/group/TE_DialogServer.mmp Fri May 14 17:04:36 2010 +0300
+++ b/datacommsserver/networkingdialogapi/TE_Dialog/group/TE_DialogServer.mmp Thu May 27 14:07:49 2010 +0300
@@ -35,14 +35,7 @@
USERINCLUDE ../src
-#ifdef SYMBIAN_OLD_EXPORT_LOCATION
-SYSTEMINCLUDE /epoc32/include
-SYSTEMINCLUDE /epoc32/include/test
-#else
OS_LAYER_SYSTEMINCLUDE_SYMBIAN
-#endif
-
-
LIBRARY euser.lib efsrv.lib
LIBRARY testexecuteutils.lib
--- a/serialserver/c32serialserver/LOOPBACK/te_loopback/group/Te_loopbacksuite.mmp Fri May 14 17:04:36 2010 +0300
+++ b/serialserver/c32serialserver/LOOPBACK/te_loopback/group/Te_loopbacksuite.mmp Thu May 27 14:07:49 2010 +0300
@@ -29,10 +29,8 @@
USERINCLUDE ..\src
-SYSTEMINCLUDE \epoc32\include
-SYSTEMINCLUDE \epoc32\include\test
-
//Please add your system include under here.
+OS_LAYER_SYSTEMINCLUDE_SYMBIAN
LIBRARY euser.lib
LIBRARY testexecuteutils.lib
--- a/serialserver/packetloopbackcsy/group/TE_PacketLoopback.mmp Fri May 14 17:04:36 2010 +0300
+++ b/serialserver/packetloopbackcsy/group/TE_PacketLoopback.mmp Thu May 27 14:07:49 2010 +0300
@@ -27,11 +27,7 @@
USERINCLUDE ../inc
-#ifdef SYMBIAN_OLD_EXPORT_LOCATION
-SYSTEMINCLUDE /epoc32/include
-#else
OS_LAYER_SYSTEMINCLUDE_SYMBIAN
-#endif
SYSTEMINCLUDE /epoc32/include/test
--- a/serialserver/serialportcsy/BLD.INF Fri May 14 17:04:36 2010 +0300
+++ b/serialserver/serialportcsy/BLD.INF Thu May 27 14:07:49 2010 +0300
@@ -18,7 +18,7 @@
ECUART.iby /epoc32/rom/include/ecuart.iby
PRJ_TESTEXPORTS
-#include "../c32serialserver/LOOPBACK/BLD.INF"
+#include "../c32serialserver/LOOPBACK/bld.inf"
PRJ_MMPFILES
ECUART.MMP