201024_03
authorhgs
Thu, 24 Jun 2010 11:25:56 +0800
changeset 41 ea44a32a96bc
parent 40 91ef7621b7fc
child 45 662fa7de7023
201024_03
charconvfw/charconv_fw/group/t_charconvfw.pkg
charconvfw/charconv_fw/test/rtest/group/t_memory.mmp
charconvfw/charconv_fw/test/rtest/group/tcomp7.mmp
charconvfw/charconv_fw/test/rtest/group/tcomp8.mmp
charconvfw/charconv_fw/test/rtest/group/terror.mmp
charconvfw/charconv_fw/test/rtest/group/timap.mmp
charconvfw/charconv_fw/test/rtest/group/tjava.mmp
charconvfw/charconv_fw/test/rtest/group/tnewlin7.mmp
charconvfw/charconv_fw/test/rtest/group/tpartial.mmp
charconvfw/charconv_fw/test/rtest/group/trealuni.mmp
charconvfw/charconv_fw/test/rtest/group/trealut8.mmp
charconvfw/charconv_fw/test/rtest/group/trfc1642.mmp
charconvfw/charconv_fw/test/rtest/group/tsimple7.mmp
charconvfw/charconv_fw/test/rtest/group/tsimple8.mmp
charconvfw/charconvplugins/bwins/CNVPICTOGRAPHSHAREDU.DEF
charconvfw/charconvplugins/bwins/CNVSHIFTJISDIRECTMAPU.DEF
charconvfw/charconvplugins/bwins/CnvPictographSharedu.def
charconvfw/charconvplugins/bwins/CnvShiftJisDirectmapu.def
charconvfw/charconvplugins/eabi/CnvShiftJisDirectmapU.DEF
charconvfw/charconvplugins/eabi/CnvShiftJisDirectmapu.def
charconvfw/charconvplugins/group/Win1250.mmp
charconvfw/charconvplugins/test/rtest/group/tKOI8R.mmp
charconvfw/charconvplugins/test/rtest/group/tKOI8U.mmp
charconvfw/charconvplugins/test/rtest/group/tTIS_620.mmp
charconvfw/charconvplugins/test/rtest/group/tautodetect.mmp
charconvfw/charconvplugins/test/rtest/group/tbig5.mmp
charconvfw/charconvplugins/test/rtest/group/tbuiltin.mmp
charconvfw/charconvplugins/test/rtest/group/tcp949.mmp
charconvfw/charconvplugins/test/rtest/group/test_multi_plugins.mmp
charconvfw/charconvplugins/test/rtest/group/teucjp_packed.mmp
charconvfw/charconvplugins/test/rtest/group/teucjp_packed_2.mmp
charconvfw/charconvplugins/test/rtest/group/teucjpdirectmap.mmp
charconvfw/charconvplugins/test/rtest/group/textendedsms.mmp
charconvfw/charconvplugins/test/rtest/group/tgb18030.mmp
charconvfw/charconvplugins/test/rtest/group/tgb2312.mmp
charconvfw/charconvplugins/test/rtest/group/tgbk.mmp
charconvfw/charconvplugins/test/rtest/group/tgeneralforeign.mmp
charconvfw/charconvplugins/test/rtest/group/thz.mmp
charconvfw/charconvplugins/test/rtest/group/tiscii.mmp
charconvfw/charconvplugins/test/rtest/group/tiso2022jp.mmp
charconvfw/charconvplugins/test/rtest/group/tiso8859x.mmp
charconvfw/charconvplugins/test/rtest/group/tj5_docomo.mmp
charconvfw/charconvplugins/test/rtest/group/tj5_kddiau.mmp
charconvfw/charconvplugins/test/rtest/group/tjis.mmp
charconvfw/charconvplugins/test/rtest/group/tportuguesegsmsingle.mmp
charconvfw/charconvplugins/test/rtest/group/tportugueselocking.mmp
charconvfw/charconvplugins/test/rtest/group/tportugueselockingsingle.mmp
charconvfw/charconvplugins/test/rtest/group/treplacement.mmp
charconvfw/charconvplugins/test/rtest/group/tshiftjis_docomo.mmp
charconvfw/charconvplugins/test/rtest/group/tshiftjis_kddiau.mmp
charconvfw/charconvplugins/test/rtest/group/tshiftjisdirectmap.mmp
charconvfw/charconvplugins/test/rtest/group/tsnm.mmp
charconvfw/charconvplugins/test/rtest/group/tspanishgsmsingle.mmp
charconvfw/charconvplugins/test/rtest/group/tturkishlocking.mmp
charconvfw/charconvplugins/test/rtest/group/tturkishlockingsingle.mmp
charconvfw/charconvplugins/test/rtest/group/tturkishsingle.mmp
charconvfw/charconvplugins/test/rtest/group/tucs2.mmp
charconvfw/charconvplugins/test/rtest/group/twin1250.mmp
charconvfw/charconvplugins/test/rtest/group/twin1251.mmp
charconvfw/charconvplugins/test/rtest/group/twin1253.mmp
charconvfw/charconvplugins/test/rtest/group/twin1254.mmp
charconvfw/charconvplugins/test/rtest/group/twin1255.mmp
charconvfw/charconvplugins/test/rtest/group/twin1256.mmp
charconvfw/charconvplugins/test/rtest/group/twin1257.mmp
charconvfw/charconvplugins/test/rtest/group/twin1258.mmp
charconvfw/charconvplugins/test/rtest/group/twin874.mmp
charconvfw/fatfilenameconversionplugins/group/t_fatcharsetconv.pkg
charconvfw/fatfilenameconversionplugins/test/T_CP1250.mmp
charconvfw/fatfilenameconversionplugins/test/T_CP1251.mmp
charconvfw/fatfilenameconversionplugins/test/T_CP1252.mmp
charconvfw/fatfilenameconversionplugins/test/T_CP1253.mmp
charconvfw/fatfilenameconversionplugins/test/T_CP1254.mmp
charconvfw/fatfilenameconversionplugins/test/T_CP1255.mmp
charconvfw/fatfilenameconversionplugins/test/T_CP1256.mmp
charconvfw/fatfilenameconversionplugins/test/T_CP1257.mmp
charconvfw/fatfilenameconversionplugins/test/T_CP1258.mmp
charconvfw/fatfilenameconversionplugins/test/T_CP54936.mmp
charconvfw/fatfilenameconversionplugins/test/T_CP874.mmp
charconvfw/fatfilenameconversionplugins/test/T_CP932.mmp
charconvfw/fatfilenameconversionplugins/test/T_CP936.mmp
charconvfw/fatfilenameconversionplugins/test/T_CP949.mmp
charconvfw/fatfilenameconversionplugins/test/T_CP950.mmp
fontservices/fontstore/group/BLD.INF
fontservices/fontstore/group/FntstoreTest.iby
fontservices/fontstore/group/bld.inf
fontservices/fontstore/group/t_fntstore.pkg
fontservices/referencefonts/utils/bdfharn.cpp
fontservices/referencefonts/utils/bdfharn.h
fontservices/referencefonts/utils/ttf2bdf.cpp
layers.sysdef.xml
localisation/localesupport/new_locale_dll/collation/share/locl_collation.h
textandlocutils/inlinetext/inc/InlineTextNoMatchesIndicatorSource.h
textandlocutils/jplangutil/BMARM/JPLANGUTILU.DEF
textandlocutils/jplangutil/BMARM/jplangutilu.def
textandlocutils/jplangutil/BWINS/JPLANGUTILU.DEF
textandlocutils/jplangutil/BWINS/jplangutilu.def
textandlocutils/jplangutil/EABI/jplangutilU.def
textandlocutils/jplangutil/EABI/jplangutilu.def
textandlocutils/jplangutil/group/bld.inf
textandlocutils/jplangutil/group/jplangutil.mmp
textandlocutils/numbergrouping/group/bld.inf
textandlocutils/numbergrouping/src/NumberGrouping.cpp
textrendering/textformatting/test/src/TForm18030/TForm18030.mmp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/charconvfw/charconv_fw/group/t_charconvfw.pkg	Thu Jun 24 11:25:56 2010 +0800
@@ -0,0 +1,39 @@
+;
+; Copyright (c) 2010 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"
+; which accompanies this distribution, and is available
+; at the URL "http:;www.eclipse.org/legal/epl-v10.html".
+;
+; Initial Contributors:
+; Nokia Corporation - initial contribution.
+;
+; Contributors:
+;
+; Description: 
+;
+
+;Languages
+&EN
+
+;Localised Vendor name
+%{"t_PTPipsuite EN"}
+
+; Vendor name
+: "t_PTPipsuite"
+
+; test scripts
+"\epoc32\release\$(platform)\$(target)\t_memory.exe"-"c:\sys\bin\t_memory.exe"
+"\epoc32\release\$(platform)\$(target)\tsimple7.exe"-"c:\sys\bin\tsimple7.exe"
+"\epoc32\release\$(platform)\$(target)\tsimple8.exe"-"c:\sys\bin\tsimple8.exe"
+"\epoc32\release\$(platform)\$(target)\trfc1642.exe"-"c:\sys\bin\trfc1642.exe"
+"\epoc32\release\$(platform)\$(target)\tcomp7.exe"-"c:\sys\bin\tcomp7.exe"
+"\epoc32\release\$(platform)\$(target)\tcomp8.exe"-"c:\sys\bin\tcomp8.exe"
+"\epoc32\release\$(platform)\$(target)\trealut8.exe"-"c:\sys\bin\trealut8.exe"
+"\epoc32\release\$(platform)\$(target)\trealuni.exe"-"c:\sys\bin\trealuni.exe"
+"\epoc32\release\$(platform)\$(target)\terror.exe"-"c:\sys\bin\terror.exe"
+"\epoc32\release\$(platform)\$(target)\tnewlin7.exe"-"c:\sys\bin\tnewlin7.exe"
+"\epoc32\release\$(platform)\$(target)\tjava.exe"-"c:\sys\bin\tjava.exe"
+"\epoc32\release\$(platform)\$(target)\tpartial.exe"-"c:\sys\bin\tpartial.exe"
+"\epoc32\release\$(platform)\$(target)\timap.exe"-"c:\sys\bin\timap.exe"
--- a/charconvfw/charconv_fw/test/rtest/group/t_memory.mmp	Thu Jun 24 11:18:23 2010 +0800
+++ b/charconvfw/charconv_fw/test/rtest/group/t_memory.mmp	Thu Jun 24 11:25:56 2010 +0800
@@ -30,4 +30,5 @@
 LIBRARY			euser.lib
 LIBRARY			charconv.lib
 
-SMPSAFE
\ No newline at end of file
+SMPSAFE
+//RTEST
--- a/charconvfw/charconv_fw/test/rtest/group/tcomp7.mmp	Thu Jun 24 11:18:23 2010 +0800
+++ b/charconvfw/charconv_fw/test/rtest/group/tcomp7.mmp	Thu Jun 24 11:25:56 2010 +0800
@@ -32,4 +32,5 @@
 LIBRARY			charconv.lib
 LIBRARY			utf7.lib
 
-SMPSAFE
\ No newline at end of file
+SMPSAFE
+//RTEST
--- a/charconvfw/charconv_fw/test/rtest/group/tcomp8.mmp	Thu Jun 24 11:18:23 2010 +0800
+++ b/charconvfw/charconv_fw/test/rtest/group/tcomp8.mmp	Thu Jun 24 11:25:56 2010 +0800
@@ -30,4 +30,5 @@
 LIBRARY			charconv.lib
 LIBRARY			utf8.lib
 
-SMPSAFE
\ No newline at end of file
+SMPSAFE
+//RTEST
--- a/charconvfw/charconv_fw/test/rtest/group/terror.mmp	Thu Jun 24 11:18:23 2010 +0800
+++ b/charconvfw/charconv_fw/test/rtest/group/terror.mmp	Thu Jun 24 11:25:56 2010 +0800
@@ -29,4 +29,5 @@
 LIBRARY			euser.lib
 LIBRARY			charconv.lib
 
-SMPSAFE
\ No newline at end of file
+SMPSAFE
+//RTEST
--- a/charconvfw/charconv_fw/test/rtest/group/timap.mmp	Thu Jun 24 11:18:23 2010 +0800
+++ b/charconvfw/charconv_fw/test/rtest/group/timap.mmp	Thu Jun 24 11:25:56 2010 +0800
@@ -30,4 +30,5 @@
 LIBRARY			efsrv.lib
 LIBRARY			charconv.lib
 
-SMPSAFE
\ No newline at end of file
+SMPSAFE
+//RTEST
--- a/charconvfw/charconv_fw/test/rtest/group/tjava.mmp	Thu Jun 24 11:18:23 2010 +0800
+++ b/charconvfw/charconv_fw/test/rtest/group/tjava.mmp	Thu Jun 24 11:25:56 2010 +0800
@@ -30,4 +30,5 @@
 LIBRARY			efsrv.lib
 LIBRARY			charconv.lib
 
-SMPSAFE
\ No newline at end of file
+SMPSAFE
+//RTEST
--- a/charconvfw/charconv_fw/test/rtest/group/tnewlin7.mmp	Thu Jun 24 11:18:23 2010 +0800
+++ b/charconvfw/charconv_fw/test/rtest/group/tnewlin7.mmp	Thu Jun 24 11:25:56 2010 +0800
@@ -29,4 +29,5 @@
 LIBRARY			euser.lib
 LIBRARY			charconv.lib
 
-SMPSAFE
\ No newline at end of file
+SMPSAFE
+//RTEST
--- a/charconvfw/charconv_fw/test/rtest/group/tpartial.mmp	Thu Jun 24 11:18:23 2010 +0800
+++ b/charconvfw/charconv_fw/test/rtest/group/tpartial.mmp	Thu Jun 24 11:25:56 2010 +0800
@@ -29,4 +29,5 @@
 LIBRARY			euser.lib
 LIBRARY			charconv.lib
 
-SMPSAFE
\ No newline at end of file
+SMPSAFE
+//RTEST
--- a/charconvfw/charconv_fw/test/rtest/group/trealuni.mmp	Thu Jun 24 11:18:23 2010 +0800
+++ b/charconvfw/charconv_fw/test/rtest/group/trealuni.mmp	Thu Jun 24 11:25:56 2010 +0800
@@ -30,4 +30,5 @@
 LIBRARY			efsrv.lib
 LIBRARY			charconv.lib
 
-SMPSAFE
\ No newline at end of file
+SMPSAFE
+//RTEST
--- a/charconvfw/charconv_fw/test/rtest/group/trealut8.mmp	Thu Jun 24 11:18:23 2010 +0800
+++ b/charconvfw/charconv_fw/test/rtest/group/trealut8.mmp	Thu Jun 24 11:25:56 2010 +0800
@@ -30,4 +30,5 @@
 LIBRARY			efsrv.lib
 LIBRARY			charconv.lib
 
-SMPSAFE
\ No newline at end of file
+SMPSAFE
+//RTEST
--- a/charconvfw/charconv_fw/test/rtest/group/trfc1642.mmp	Thu Jun 24 11:18:23 2010 +0800
+++ b/charconvfw/charconv_fw/test/rtest/group/trfc1642.mmp	Thu Jun 24 11:25:56 2010 +0800
@@ -29,4 +29,5 @@
 LIBRARY			euser.lib
 LIBRARY			charconv.lib
 
-SMPSAFE
\ No newline at end of file
+SMPSAFE
+//RTEST
--- a/charconvfw/charconv_fw/test/rtest/group/tsimple7.mmp	Thu Jun 24 11:18:23 2010 +0800
+++ b/charconvfw/charconv_fw/test/rtest/group/tsimple7.mmp	Thu Jun 24 11:25:56 2010 +0800
@@ -29,4 +29,5 @@
 LIBRARY			euser.lib
 LIBRARY			charconv.lib
 
-SMPSAFE
\ No newline at end of file
+SMPSAFE
+//RTEST
--- a/charconvfw/charconv_fw/test/rtest/group/tsimple8.mmp	Thu Jun 24 11:18:23 2010 +0800
+++ b/charconvfw/charconv_fw/test/rtest/group/tsimple8.mmp	Thu Jun 24 11:25:56 2010 +0800
@@ -29,4 +29,5 @@
 LIBRARY			euser.lib
 LIBRARY			charconv.lib
 
-SMPSAFE
\ No newline at end of file
+SMPSAFE
+//RTEST
--- a/charconvfw/charconvplugins/bwins/CNVPICTOGRAPHSHAREDU.DEF	Thu Jun 24 11:18:23 2010 +0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,8 +0,0 @@
-EXPORTS
-	?CountOfPictographPagesFromUnicode@@YAHXZ @ 1 NONAME ; int CountOfPictographPagesFromUnicode(void)
-	?CountOfPictographPagesToUnicode@@YAHXZ @ 2 NONAME ; int CountOfPictographPagesToUnicode(void)
-	?SetCharacterSetsForPictograph@@YAXAAV?$RArray@USCharacterSet@CnvUtilities@@@@@Z @ 3 NONAME ; void SetCharacterSetsForPictograph(class RArray<struct CnvUtilities::SCharacterSet> &)
-	?SetMethodsForPictograph@@YAXAAV?$RArray@USMethod@CnvUtilities@@@@W4TOriginalCharset@@@Z @ 4 NONAME ; void SetMethodsForPictograph(class RArray<struct CnvUtilities::SMethod> &, enum TOriginalCharset)
-	?SetStatesForPictograph@@YAXAAV?$RArray@USState@CnvUtilities@@@@@Z @ 5 NONAME ; void SetStatesForPictograph(class RArray<struct CnvUtilities::SState> &)
-	?SetCharacterSetsForPictograph@@YAXAAV?$RArray@USCharacterSet@CnvUtilities@@@@W4TOriginalCharset@@@Z @ 6 NONAME ; void SetCharacterSetsForPictograph(class RArray<struct CnvUtilities::SCharacterSet> &, enum TOriginalCharset)
-
--- a/charconvfw/charconvplugins/bwins/CNVSHIFTJISDIRECTMAPU.DEF	Thu Jun 24 11:18:23 2010 +0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-EXPORTS
-	?ConversionData@CnvShiftJisDirectmap@@SAABUSCnvConversionData@@XZ @ 1 NONAME ; struct SCnvConversionData const & CnvShiftJisDirectmap::ConversionData(void)
-
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/charconvfw/charconvplugins/bwins/CnvPictographSharedu.def	Thu Jun 24 11:25:56 2010 +0800
@@ -0,0 +1,8 @@
+EXPORTS
+	?CountOfPictographPagesFromUnicode@@YAHXZ @ 1 NONAME ; int CountOfPictographPagesFromUnicode(void)
+	?CountOfPictographPagesToUnicode@@YAHXZ @ 2 NONAME ; int CountOfPictographPagesToUnicode(void)
+	?SetCharacterSetsForPictograph@@YAXAAV?$RArray@USCharacterSet@CnvUtilities@@@@@Z @ 3 NONAME ; void SetCharacterSetsForPictograph(class RArray<struct CnvUtilities::SCharacterSet> &)
+	?SetMethodsForPictograph@@YAXAAV?$RArray@USMethod@CnvUtilities@@@@W4TOriginalCharset@@@Z @ 4 NONAME ; void SetMethodsForPictograph(class RArray<struct CnvUtilities::SMethod> &, enum TOriginalCharset)
+	?SetStatesForPictograph@@YAXAAV?$RArray@USState@CnvUtilities@@@@@Z @ 5 NONAME ; void SetStatesForPictograph(class RArray<struct CnvUtilities::SState> &)
+	?SetCharacterSetsForPictograph@@YAXAAV?$RArray@USCharacterSet@CnvUtilities@@@@W4TOriginalCharset@@@Z @ 6 NONAME ; void SetCharacterSetsForPictograph(class RArray<struct CnvUtilities::SCharacterSet> &, enum TOriginalCharset)
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/charconvfw/charconvplugins/bwins/CnvShiftJisDirectmapu.def	Thu Jun 24 11:25:56 2010 +0800
@@ -0,0 +1,3 @@
+EXPORTS
+	?ConversionData@CnvShiftJisDirectmap@@SAABUSCnvConversionData@@XZ @ 1 NONAME ; struct SCnvConversionData const & CnvShiftJisDirectmap::ConversionData(void)
+
--- a/charconvfw/charconvplugins/eabi/CnvShiftJisDirectmapU.DEF	Thu Jun 24 11:18:23 2010 +0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-EXPORTS
-	_ZN20CnvShiftJisDirectmap14ConversionDataEv @ 1 NONAME
-
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/charconvfw/charconvplugins/eabi/CnvShiftJisDirectmapu.def	Thu Jun 24 11:25:56 2010 +0800
@@ -0,0 +1,3 @@
+EXPORTS
+	_ZN20CnvShiftJisDirectmap14ConversionDataEv @ 1 NONAME
+
--- a/charconvfw/charconvplugins/group/Win1250.mmp	Thu Jun 24 11:18:23 2010 +0800
+++ b/charconvfw/charconvplugins/group/Win1250.mmp	Thu Jun 24 11:25:56 2010 +0800
@@ -38,7 +38,7 @@
 
 SOURCEPATH		../resource
 
-Start resource       win1250.rss
+Start resource       Win1250.rss
 Targetpath           /resource/charconv
 End
 
--- a/charconvfw/charconvplugins/test/rtest/group/tKOI8R.mmp	Thu Jun 24 11:18:23 2010 +0800
+++ b/charconvfw/charconvplugins/test/rtest/group/tKOI8R.mmp	Thu Jun 24 11:25:56 2010 +0800
@@ -33,3 +33,4 @@
 LIBRARY			charconv.lib
 
 SMPSAFE
+//RTEST
--- a/charconvfw/charconvplugins/test/rtest/group/tKOI8U.mmp	Thu Jun 24 11:18:23 2010 +0800
+++ b/charconvfw/charconvplugins/test/rtest/group/tKOI8U.mmp	Thu Jun 24 11:25:56 2010 +0800
@@ -33,3 +33,4 @@
 LIBRARY			charconv.lib
 
 SMPSAFE
+//RTEST
--- a/charconvfw/charconvplugins/test/rtest/group/tTIS_620.mmp	Thu Jun 24 11:18:23 2010 +0800
+++ b/charconvfw/charconvplugins/test/rtest/group/tTIS_620.mmp	Thu Jun 24 11:25:56 2010 +0800
@@ -33,3 +33,4 @@
 LIBRARY			charconv.lib
 
 SMPSAFE
+//RTEST
--- a/charconvfw/charconvplugins/test/rtest/group/tautodetect.mmp	Thu Jun 24 11:18:23 2010 +0800
+++ b/charconvfw/charconvplugins/test/rtest/group/tautodetect.mmp	Thu Jun 24 11:25:56 2010 +0800
@@ -37,4 +37,5 @@
 LIBRARY			efsrv.lib
 LIBRARY			charconv.lib
 
-SMPSAFE
\ No newline at end of file
+SMPSAFE
+//RTEST
\ No newline at end of file
--- a/charconvfw/charconvplugins/test/rtest/group/tbig5.mmp	Thu Jun 24 11:18:23 2010 +0800
+++ b/charconvfw/charconvplugins/test/rtest/group/tbig5.mmp	Thu Jun 24 11:25:56 2010 +0800
@@ -32,4 +32,5 @@
 LIBRARY			efsrv.lib
 LIBRARY			charconv.lib
 
-SMPSAFE
\ No newline at end of file
+SMPSAFE
+//RTEST
\ No newline at end of file
--- a/charconvfw/charconvplugins/test/rtest/group/tbuiltin.mmp	Thu Jun 24 11:18:23 2010 +0800
+++ b/charconvfw/charconvplugins/test/rtest/group/tbuiltin.mmp	Thu Jun 24 11:25:56 2010 +0800
@@ -34,4 +34,5 @@
 
 epocstacksize		0x5000
 
-SMPSAFE
\ No newline at end of file
+SMPSAFE
+//RTEST
\ No newline at end of file
--- a/charconvfw/charconvplugins/test/rtest/group/tcp949.mmp	Thu Jun 24 11:18:23 2010 +0800
+++ b/charconvfw/charconvplugins/test/rtest/group/tcp949.mmp	Thu Jun 24 11:25:56 2010 +0800
@@ -33,3 +33,4 @@
 LIBRARY			charconv.lib
 
 SMPSAFE
+//RTEST
--- a/charconvfw/charconvplugins/test/rtest/group/test_multi_plugins.mmp	Thu Jun 24 11:18:23 2010 +0800
+++ b/charconvfw/charconvplugins/test/rtest/group/test_multi_plugins.mmp	Thu Jun 24 11:25:56 2010 +0800
@@ -33,4 +33,5 @@
 LIBRARY			charconv.lib
 LIBRARY			ecom.lib 
 
-SMPSAFE
\ No newline at end of file
+SMPSAFE
+//RTEST
\ No newline at end of file
--- a/charconvfw/charconvplugins/test/rtest/group/teucjp_packed.mmp	Thu Jun 24 11:18:23 2010 +0800
+++ b/charconvfw/charconvplugins/test/rtest/group/teucjp_packed.mmp	Thu Jun 24 11:25:56 2010 +0800
@@ -31,4 +31,5 @@
 LIBRARY			efsrv.lib
 LIBRARY			charconv.lib
 
-SMPSAFE
\ No newline at end of file
+SMPSAFE
+//RTEST
\ No newline at end of file
--- a/charconvfw/charconvplugins/test/rtest/group/teucjp_packed_2.mmp	Thu Jun 24 11:18:23 2010 +0800
+++ b/charconvfw/charconvplugins/test/rtest/group/teucjp_packed_2.mmp	Thu Jun 24 11:25:56 2010 +0800
@@ -32,4 +32,5 @@
 LIBRARY			efsrv.lib
 LIBRARY			charconv.lib
 
-SMPSAFE
\ No newline at end of file
+SMPSAFE
+//RTEST
\ No newline at end of file
--- a/charconvfw/charconvplugins/test/rtest/group/teucjpdirectmap.mmp	Thu Jun 24 11:18:23 2010 +0800
+++ b/charconvfw/charconvplugins/test/rtest/group/teucjpdirectmap.mmp	Thu Jun 24 11:25:56 2010 +0800
@@ -32,4 +32,5 @@
 LIBRARY			efsrv.lib
 LIBRARY			charconv.lib
 
-SMPSAFE
\ No newline at end of file
+SMPSAFE
+//RTEST
\ No newline at end of file
--- a/charconvfw/charconvplugins/test/rtest/group/textendedsms.mmp	Thu Jun 24 11:18:23 2010 +0800
+++ b/charconvfw/charconvplugins/test/rtest/group/textendedsms.mmp	Thu Jun 24 11:25:56 2010 +0800
@@ -32,4 +32,5 @@
 LIBRARY			efsrv.lib
 LIBRARY			charconv.lib
 
-SMPSAFE
\ No newline at end of file
+SMPSAFE
+//RTEST
\ No newline at end of file
--- a/charconvfw/charconvplugins/test/rtest/group/tgb18030.mmp	Thu Jun 24 11:18:23 2010 +0800
+++ b/charconvfw/charconvplugins/test/rtest/group/tgb18030.mmp	Thu Jun 24 11:25:56 2010 +0800
@@ -32,4 +32,5 @@
 LIBRARY			charconv.lib
 LIBRARY			hal.lib
 
-SMPSAFE
\ No newline at end of file
+SMPSAFE
+//RTEST
\ No newline at end of file
--- a/charconvfw/charconvplugins/test/rtest/group/tgb2312.mmp	Thu Jun 24 11:18:23 2010 +0800
+++ b/charconvfw/charconvplugins/test/rtest/group/tgb2312.mmp	Thu Jun 24 11:25:56 2010 +0800
@@ -34,4 +34,5 @@
 
 epocstacksize	0x5000
 
-SMPSAFE
\ No newline at end of file
+SMPSAFE
+//RTEST
\ No newline at end of file
--- a/charconvfw/charconvplugins/test/rtest/group/tgbk.mmp	Thu Jun 24 11:18:23 2010 +0800
+++ b/charconvfw/charconvplugins/test/rtest/group/tgbk.mmp	Thu Jun 24 11:25:56 2010 +0800
@@ -31,4 +31,5 @@
 LIBRARY			efsrv.lib
 LIBRARY			charconv.lib
 
-SMPSAFE
\ No newline at end of file
+SMPSAFE
+//RTEST
\ No newline at end of file
--- a/charconvfw/charconvplugins/test/rtest/group/tgeneralforeign.mmp	Thu Jun 24 11:18:23 2010 +0800
+++ b/charconvfw/charconvplugins/test/rtest/group/tgeneralforeign.mmp	Thu Jun 24 11:25:56 2010 +0800
@@ -34,4 +34,5 @@
 
 epocstacksize 		0x5000
 
-SMPSAFE
\ No newline at end of file
+SMPSAFE
+//RTEST
\ No newline at end of file
--- a/charconvfw/charconvplugins/test/rtest/group/thz.mmp	Thu Jun 24 11:18:23 2010 +0800
+++ b/charconvfw/charconvplugins/test/rtest/group/thz.mmp	Thu Jun 24 11:25:56 2010 +0800
@@ -31,4 +31,5 @@
 LIBRARY			efsrv.lib
 LIBRARY			charconv.lib
 
-SMPSAFE
\ No newline at end of file
+SMPSAFE
+//RTEST
\ No newline at end of file
--- a/charconvfw/charconvplugins/test/rtest/group/tiscii.mmp	Thu Jun 24 11:18:23 2010 +0800
+++ b/charconvfw/charconvplugins/test/rtest/group/tiscii.mmp	Thu Jun 24 11:25:56 2010 +0800
@@ -33,3 +33,4 @@
 LIBRARY			charconv.lib
 
 SMPSAFE
+//RTEST
--- a/charconvfw/charconvplugins/test/rtest/group/tiso2022jp.mmp	Thu Jun 24 11:18:23 2010 +0800
+++ b/charconvfw/charconvplugins/test/rtest/group/tiso2022jp.mmp	Thu Jun 24 11:25:56 2010 +0800
@@ -32,4 +32,5 @@
 LIBRARY			efsrv.lib
 LIBRARY			charconv.lib
 
-SMPSAFE
\ No newline at end of file
+SMPSAFE
+//RTEST
\ No newline at end of file
--- a/charconvfw/charconvplugins/test/rtest/group/tiso8859x.mmp	Thu Jun 24 11:18:23 2010 +0800
+++ b/charconvfw/charconvplugins/test/rtest/group/tiso8859x.mmp	Thu Jun 24 11:25:56 2010 +0800
@@ -35,4 +35,5 @@
 LIBRARY			efsrv.lib 
 LIBRARY			charconv.lib
 
-SMPSAFE
\ No newline at end of file
+SMPSAFE
+//RTEST
\ No newline at end of file
--- a/charconvfw/charconvplugins/test/rtest/group/tj5_docomo.mmp	Thu Jun 24 11:18:23 2010 +0800
+++ b/charconvfw/charconvplugins/test/rtest/group/tj5_docomo.mmp	Thu Jun 24 11:25:56 2010 +0800
@@ -38,4 +38,5 @@
 
 epocstacksize	20000
 
-SMPSAFE
\ No newline at end of file
+SMPSAFE
+//RTEST
\ No newline at end of file
--- a/charconvfw/charconvplugins/test/rtest/group/tj5_kddiau.mmp	Thu Jun 24 11:18:23 2010 +0800
+++ b/charconvfw/charconvplugins/test/rtest/group/tj5_kddiau.mmp	Thu Jun 24 11:25:56 2010 +0800
@@ -35,4 +35,5 @@
 
 epocstacksize	20000
 
-SMPSAFE
\ No newline at end of file
+SMPSAFE
+//RTEST
\ No newline at end of file
--- a/charconvfw/charconvplugins/test/rtest/group/tjis.mmp	Thu Jun 24 11:18:23 2010 +0800
+++ b/charconvfw/charconvplugins/test/rtest/group/tjis.mmp	Thu Jun 24 11:25:56 2010 +0800
@@ -31,4 +31,5 @@
 LIBRARY			efsrv.lib
 LIBRARY			charconv.lib
 
-SMPSAFE
\ No newline at end of file
+SMPSAFE
+//RTEST
\ No newline at end of file
--- a/charconvfw/charconvplugins/test/rtest/group/tportuguesegsmsingle.mmp	Thu Jun 24 11:18:23 2010 +0800
+++ b/charconvfw/charconvplugins/test/rtest/group/tportuguesegsmsingle.mmp	Thu Jun 24 11:25:56 2010 +0800
@@ -33,4 +33,5 @@
 LIBRARY			efsrv.lib
 LIBRARY			charconv.lib
 
-SMPSAFE
\ No newline at end of file
+SMPSAFE
+//RTEST
\ No newline at end of file
--- a/charconvfw/charconvplugins/test/rtest/group/tportugueselocking.mmp	Thu Jun 24 11:18:23 2010 +0800
+++ b/charconvfw/charconvplugins/test/rtest/group/tportugueselocking.mmp	Thu Jun 24 11:25:56 2010 +0800
@@ -33,4 +33,5 @@
 LIBRARY			efsrv.lib
 LIBRARY			charconv.lib
 
-SMPSAFE
\ No newline at end of file
+SMPSAFE
+//RTEST
\ No newline at end of file
--- a/charconvfw/charconvplugins/test/rtest/group/tportugueselockingsingle.mmp	Thu Jun 24 11:18:23 2010 +0800
+++ b/charconvfw/charconvplugins/test/rtest/group/tportugueselockingsingle.mmp	Thu Jun 24 11:25:56 2010 +0800
@@ -33,4 +33,5 @@
 LIBRARY			efsrv.lib
 LIBRARY			charconv.lib
 
-SMPSAFE
\ No newline at end of file
+SMPSAFE
+//RTEST
\ No newline at end of file
--- a/charconvfw/charconvplugins/test/rtest/group/treplacement.mmp	Thu Jun 24 11:18:23 2010 +0800
+++ b/charconvfw/charconvplugins/test/rtest/group/treplacement.mmp	Thu Jun 24 11:25:56 2010 +0800
@@ -32,4 +32,5 @@
 LIBRARY			efsrv.lib
 LIBRARY			charconv.lib
 
-SMPSAFE
\ No newline at end of file
+SMPSAFE
+//RTEST
\ No newline at end of file
--- a/charconvfw/charconvplugins/test/rtest/group/tshiftjis_docomo.mmp	Thu Jun 24 11:18:23 2010 +0800
+++ b/charconvfw/charconvplugins/test/rtest/group/tshiftjis_docomo.mmp	Thu Jun 24 11:25:56 2010 +0800
@@ -38,4 +38,5 @@
 
 epocstacksize	20000
 
-SMPSAFE
\ No newline at end of file
+SMPSAFE
+//RTEST
\ No newline at end of file
--- a/charconvfw/charconvplugins/test/rtest/group/tshiftjis_kddiau.mmp	Thu Jun 24 11:18:23 2010 +0800
+++ b/charconvfw/charconvplugins/test/rtest/group/tshiftjis_kddiau.mmp	Thu Jun 24 11:25:56 2010 +0800
@@ -36,4 +36,5 @@
 
 epocstacksize	20000
 
-SMPSAFE
\ No newline at end of file
+SMPSAFE
+//RTEST
\ No newline at end of file
--- a/charconvfw/charconvplugins/test/rtest/group/tshiftjisdirectmap.mmp	Thu Jun 24 11:18:23 2010 +0800
+++ b/charconvfw/charconvplugins/test/rtest/group/tshiftjisdirectmap.mmp	Thu Jun 24 11:25:56 2010 +0800
@@ -32,4 +32,5 @@
 LIBRARY			efsrv.lib
 LIBRARY			charconv.lib
 
-SMPSAFE
\ No newline at end of file
+SMPSAFE
+//RTEST
\ No newline at end of file
--- a/charconvfw/charconvplugins/test/rtest/group/tsnm.mmp	Thu Jun 24 11:18:23 2010 +0800
+++ b/charconvfw/charconvplugins/test/rtest/group/tsnm.mmp	Thu Jun 24 11:25:56 2010 +0800
@@ -32,4 +32,5 @@
 LIBRARY			efsrv.lib
 LIBRARY			charconv.lib
 
-SMPSAFE
\ No newline at end of file
+SMPSAFE
+//RTEST
\ No newline at end of file
--- a/charconvfw/charconvplugins/test/rtest/group/tspanishgsmsingle.mmp	Thu Jun 24 11:18:23 2010 +0800
+++ b/charconvfw/charconvplugins/test/rtest/group/tspanishgsmsingle.mmp	Thu Jun 24 11:25:56 2010 +0800
@@ -33,4 +33,5 @@
 LIBRARY			efsrv.lib
 LIBRARY			charconv.lib
 
-SMPSAFE
\ No newline at end of file
+SMPSAFE
+//RTEST
\ No newline at end of file
--- a/charconvfw/charconvplugins/test/rtest/group/tturkishlocking.mmp	Thu Jun 24 11:18:23 2010 +0800
+++ b/charconvfw/charconvplugins/test/rtest/group/tturkishlocking.mmp	Thu Jun 24 11:25:56 2010 +0800
@@ -32,4 +32,5 @@
 LIBRARY			efsrv.lib
 LIBRARY			charconv.lib
 
-SMPSAFE
\ No newline at end of file
+SMPSAFE
+//RTEST
\ No newline at end of file
--- a/charconvfw/charconvplugins/test/rtest/group/tturkishlockingsingle.mmp	Thu Jun 24 11:18:23 2010 +0800
+++ b/charconvfw/charconvplugins/test/rtest/group/tturkishlockingsingle.mmp	Thu Jun 24 11:25:56 2010 +0800
@@ -32,4 +32,5 @@
 LIBRARY			efsrv.lib
 LIBRARY			charconv.lib
 
-SMPSAFE
\ No newline at end of file
+SMPSAFE
+//RTEST
\ No newline at end of file
--- a/charconvfw/charconvplugins/test/rtest/group/tturkishsingle.mmp	Thu Jun 24 11:18:23 2010 +0800
+++ b/charconvfw/charconvplugins/test/rtest/group/tturkishsingle.mmp	Thu Jun 24 11:25:56 2010 +0800
@@ -32,4 +32,5 @@
 LIBRARY			efsrv.lib
 LIBRARY			charconv.lib
 
-SMPSAFE
\ No newline at end of file
+SMPSAFE
+//RTEST
\ No newline at end of file
--- a/charconvfw/charconvplugins/test/rtest/group/tucs2.mmp	Thu Jun 24 11:18:23 2010 +0800
+++ b/charconvfw/charconvplugins/test/rtest/group/tucs2.mmp	Thu Jun 24 11:25:56 2010 +0800
@@ -33,4 +33,5 @@
 LIBRARY			efsrv.lib
 LIBRARY			charconv.lib
 
-SMPSAFE
\ No newline at end of file
+SMPSAFE
+//RTEST
\ No newline at end of file
--- a/charconvfw/charconvplugins/test/rtest/group/twin1250.mmp	Thu Jun 24 11:18:23 2010 +0800
+++ b/charconvfw/charconvplugins/test/rtest/group/twin1250.mmp	Thu Jun 24 11:25:56 2010 +0800
@@ -33,3 +33,4 @@
 LIBRARY			charconv.lib
 
 SMPSAFE
+//RTEST
--- a/charconvfw/charconvplugins/test/rtest/group/twin1251.mmp	Thu Jun 24 11:18:23 2010 +0800
+++ b/charconvfw/charconvplugins/test/rtest/group/twin1251.mmp	Thu Jun 24 11:25:56 2010 +0800
@@ -33,3 +33,4 @@
 LIBRARY			charconv.lib
 
 SMPSAFE
+//RTEST
--- a/charconvfw/charconvplugins/test/rtest/group/twin1253.mmp	Thu Jun 24 11:18:23 2010 +0800
+++ b/charconvfw/charconvplugins/test/rtest/group/twin1253.mmp	Thu Jun 24 11:25:56 2010 +0800
@@ -33,3 +33,4 @@
 LIBRARY			charconv.lib
 
 SMPSAFE
+//RTEST
--- a/charconvfw/charconvplugins/test/rtest/group/twin1254.mmp	Thu Jun 24 11:18:23 2010 +0800
+++ b/charconvfw/charconvplugins/test/rtest/group/twin1254.mmp	Thu Jun 24 11:25:56 2010 +0800
@@ -33,3 +33,4 @@
 LIBRARY			charconv.lib
 
 SMPSAFE
+//RTEST
--- a/charconvfw/charconvplugins/test/rtest/group/twin1255.mmp	Thu Jun 24 11:18:23 2010 +0800
+++ b/charconvfw/charconvplugins/test/rtest/group/twin1255.mmp	Thu Jun 24 11:25:56 2010 +0800
@@ -33,3 +33,4 @@
 LIBRARY			charconv.lib
 
 SMPSAFE
+//RTEST
--- a/charconvfw/charconvplugins/test/rtest/group/twin1256.mmp	Thu Jun 24 11:18:23 2010 +0800
+++ b/charconvfw/charconvplugins/test/rtest/group/twin1256.mmp	Thu Jun 24 11:25:56 2010 +0800
@@ -33,3 +33,4 @@
 LIBRARY			charconv.lib
 
 SMPSAFE
+//RTEST
--- a/charconvfw/charconvplugins/test/rtest/group/twin1257.mmp	Thu Jun 24 11:18:23 2010 +0800
+++ b/charconvfw/charconvplugins/test/rtest/group/twin1257.mmp	Thu Jun 24 11:25:56 2010 +0800
@@ -33,3 +33,4 @@
 LIBRARY			charconv.lib
 
 SMPSAFE
+//RTEST
--- a/charconvfw/charconvplugins/test/rtest/group/twin1258.mmp	Thu Jun 24 11:18:23 2010 +0800
+++ b/charconvfw/charconvplugins/test/rtest/group/twin1258.mmp	Thu Jun 24 11:25:56 2010 +0800
@@ -33,3 +33,4 @@
 LIBRARY			charconv.lib
 
 SMPSAFE
+//RTEST
--- a/charconvfw/charconvplugins/test/rtest/group/twin874.mmp	Thu Jun 24 11:18:23 2010 +0800
+++ b/charconvfw/charconvplugins/test/rtest/group/twin874.mmp	Thu Jun 24 11:25:56 2010 +0800
@@ -33,3 +33,4 @@
 LIBRARY			charconv.lib
 
 SMPSAFE
+//RTEST
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/charconvfw/fatfilenameconversionplugins/group/t_fatcharsetconv.pkg	Thu Jun 24 11:25:56 2010 +0800
@@ -0,0 +1,41 @@
+;
+; Copyright (c) 2010 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"
+; which accompanies this distribution, and is available
+; at the URL "http:;www.eclipse.org/legal/epl-v10.html".
+;
+; Initial Contributors:
+; Nokia Corporation - initial contribution.
+;
+; Contributors:
+;
+; Description: 
+;
+
+;Languages
+&EN
+
+;Localised Vendor name
+%{"t_PTPipsuite EN"}
+
+; Vendor name
+: "t_PTPipsuite"
+
+; test scripts
+"\epoc32\release\$(platform)\$(target)\T_CP950.exe"		-"c:\sys\bin\T_CP950.exe"
+"\epoc32\release\$(platform)\$(target)\T_CP949.exe"		-"c:\sys\bin\T_CP949.exe"
+"\epoc32\release\$(platform)\$(target)\T_CP936.exe"		-"c:\sys\bin\T_CP936.exe"
+"\epoc32\release\$(platform)\$(target)\T_CP54936.exe"	-"c:\sys\bin\T_CP54936.exe"
+"\epoc32\release\$(platform)\$(target)\T_CP932.exe"		-"c:\sys\bin\T_CP932.exe"
+"\epoc32\release\$(platform)\$(target)\T_CP874.exe"		-"c:\sys\bin\T_CP874.exe"
+"\epoc32\release\$(platform)\$(target)\T_CP1258.exe"	-"c:\sys\bin\T_CP1258.exe"
+"\epoc32\release\$(platform)\$(target)\T_CP1257.exe"	-"c:\sys\bin\T_CP1257.exe"
+"\epoc32\release\$(platform)\$(target)\T_CP1256.exe"	-"c:\sys\bin\T_CP1256.exe"
+"\epoc32\release\$(platform)\$(target)\T_CP1255.exe"	-"c:\sys\bin\T_CP1255.exe"
+"\epoc32\release\$(platform)\$(target)\T_CP1254.exe"	-"c:\sys\bin\T_CP1254.exe"
+"\epoc32\release\$(platform)\$(target)\T_CP1253.exe"	-"c:\sys\bin\T_CP1253.exe"
+"\epoc32\release\$(platform)\$(target)\T_CP1252.exe"	-"c:\sys\bin\T_CP1252.exe"
+"\epoc32\release\$(platform)\$(target)\T_CP1251.exe"	-"c:\sys\bin\T_CP1251.exe"
+"\epoc32\release\$(platform)\$(target)\T_CP1250.exe"	-"c:\sys\bin\T_CP1250.exe"
--- a/charconvfw/fatfilenameconversionplugins/test/T_CP1250.mmp	Thu Jun 24 11:18:23 2010 +0800
+++ b/charconvfw/fatfilenameconversionplugins/test/T_CP1250.mmp	Thu Jun 24 11:25:56 2010 +0800
@@ -31,4 +31,5 @@
 
 LIBRARY			euser.lib
 
-SMPSAFE
\ No newline at end of file
+SMPSAFE
+//RTEST
--- a/charconvfw/fatfilenameconversionplugins/test/T_CP1251.mmp	Thu Jun 24 11:18:23 2010 +0800
+++ b/charconvfw/fatfilenameconversionplugins/test/T_CP1251.mmp	Thu Jun 24 11:25:56 2010 +0800
@@ -30,4 +30,5 @@
 
 LIBRARY			euser.lib
 
-SMPSAFE
\ No newline at end of file
+SMPSAFE
+//RTEST
--- a/charconvfw/fatfilenameconversionplugins/test/T_CP1252.mmp	Thu Jun 24 11:18:23 2010 +0800
+++ b/charconvfw/fatfilenameconversionplugins/test/T_CP1252.mmp	Thu Jun 24 11:25:56 2010 +0800
@@ -30,4 +30,5 @@
 
 LIBRARY			euser.lib
 
-SMPSAFE
\ No newline at end of file
+SMPSAFE
+//RTEST
--- a/charconvfw/fatfilenameconversionplugins/test/T_CP1253.mmp	Thu Jun 24 11:18:23 2010 +0800
+++ b/charconvfw/fatfilenameconversionplugins/test/T_CP1253.mmp	Thu Jun 24 11:25:56 2010 +0800
@@ -30,4 +30,5 @@
 
 LIBRARY			euser.lib
 
-SMPSAFE
\ No newline at end of file
+SMPSAFE
+//RTEST
--- a/charconvfw/fatfilenameconversionplugins/test/T_CP1254.mmp	Thu Jun 24 11:18:23 2010 +0800
+++ b/charconvfw/fatfilenameconversionplugins/test/T_CP1254.mmp	Thu Jun 24 11:25:56 2010 +0800
@@ -30,4 +30,5 @@
 
 LIBRARY			euser.lib 
 
-SMPSAFE
\ No newline at end of file
+SMPSAFE
+//RTEST
--- a/charconvfw/fatfilenameconversionplugins/test/T_CP1255.mmp	Thu Jun 24 11:18:23 2010 +0800
+++ b/charconvfw/fatfilenameconversionplugins/test/T_CP1255.mmp	Thu Jun 24 11:25:56 2010 +0800
@@ -30,4 +30,5 @@
 
 LIBRARY			euser.lib
 
-SMPSAFE
\ No newline at end of file
+SMPSAFE
+//RTEST
--- a/charconvfw/fatfilenameconversionplugins/test/T_CP1256.mmp	Thu Jun 24 11:18:23 2010 +0800
+++ b/charconvfw/fatfilenameconversionplugins/test/T_CP1256.mmp	Thu Jun 24 11:25:56 2010 +0800
@@ -30,4 +30,5 @@
 
 LIBRARY			euser.lib 
 
-SMPSAFE
\ No newline at end of file
+SMPSAFE
+//RTEST
--- a/charconvfw/fatfilenameconversionplugins/test/T_CP1257.mmp	Thu Jun 24 11:18:23 2010 +0800
+++ b/charconvfw/fatfilenameconversionplugins/test/T_CP1257.mmp	Thu Jun 24 11:25:56 2010 +0800
@@ -30,4 +30,5 @@
 
 LIBRARY			euser.lib 
 
-SMPSAFE
\ No newline at end of file
+SMPSAFE
+//RTEST
--- a/charconvfw/fatfilenameconversionplugins/test/T_CP1258.mmp	Thu Jun 24 11:18:23 2010 +0800
+++ b/charconvfw/fatfilenameconversionplugins/test/T_CP1258.mmp	Thu Jun 24 11:25:56 2010 +0800
@@ -30,4 +30,5 @@
 
 LIBRARY			euser.lib
 
-SMPSAFE
\ No newline at end of file
+SMPSAFE
+//RTEST
--- a/charconvfw/fatfilenameconversionplugins/test/T_CP54936.mmp	Thu Jun 24 11:18:23 2010 +0800
+++ b/charconvfw/fatfilenameconversionplugins/test/T_CP54936.mmp	Thu Jun 24 11:25:56 2010 +0800
@@ -30,4 +30,6 @@
 LIBRARY			euser.lib hal.lib
 
 SMPSAFE
+//RTEST
+
 SOURCE T_CP54936.CPP
--- a/charconvfw/fatfilenameconversionplugins/test/T_CP874.mmp	Thu Jun 24 11:18:23 2010 +0800
+++ b/charconvfw/fatfilenameconversionplugins/test/T_CP874.mmp	Thu Jun 24 11:25:56 2010 +0800
@@ -30,4 +30,5 @@
 
 LIBRARY			euser.lib
 
-SMPSAFE
\ No newline at end of file
+SMPSAFE
+//RTEST
--- a/charconvfw/fatfilenameconversionplugins/test/T_CP932.mmp	Thu Jun 24 11:18:23 2010 +0800
+++ b/charconvfw/fatfilenameconversionplugins/test/T_CP932.mmp	Thu Jun 24 11:25:56 2010 +0800
@@ -30,4 +30,5 @@
 
 LIBRARY			euser.lib
 
-SMPSAFE
\ No newline at end of file
+SMPSAFE
+//RTEST
--- a/charconvfw/fatfilenameconversionplugins/test/T_CP936.mmp	Thu Jun 24 11:18:23 2010 +0800
+++ b/charconvfw/fatfilenameconversionplugins/test/T_CP936.mmp	Thu Jun 24 11:25:56 2010 +0800
@@ -30,4 +30,5 @@
 
 LIBRARY			euser.lib
 
-SMPSAFE
\ No newline at end of file
+SMPSAFE
+//RTEST
--- a/charconvfw/fatfilenameconversionplugins/test/T_CP949.mmp	Thu Jun 24 11:18:23 2010 +0800
+++ b/charconvfw/fatfilenameconversionplugins/test/T_CP949.mmp	Thu Jun 24 11:25:56 2010 +0800
@@ -30,4 +30,5 @@
 
 LIBRARY			euser.lib
 
-SMPSAFE
\ No newline at end of file
+SMPSAFE
+//RTEST
--- a/charconvfw/fatfilenameconversionplugins/test/T_CP950.mmp	Thu Jun 24 11:18:23 2010 +0800
+++ b/charconvfw/fatfilenameconversionplugins/test/T_CP950.mmp	Thu Jun 24 11:25:56 2010 +0800
@@ -30,4 +30,5 @@
 
 LIBRARY			euser.lib 
 
-SMPSAFE
\ No newline at end of file
+SMPSAFE
+//RTEST
--- a/fontservices/fontstore/group/BLD.INF	Thu Jun 24 11:18:23 2010 +0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,151 +0,0 @@
-/*
-* Copyright (c) 2006-2010 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"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: 
-* Font store
-*
-*/
-
-
-/**
- @file
-*/
-
-
-
-PRJ_PLATFORMS
-
-DEFAULT
-
-PRJ_EXPORTS
-
-../inc/FNTSTORE.H SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(fntstore.h)
-../inc/OPENFONT.H SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(openfont.h)
-../inc/openfontconstants.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(graphics/openfontconstants.h)
-../inc/openfontrasterizer.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(graphics/openfontrasterizer.h)
-../inc/openfontlinkedtypefaceelementspec.h SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(openfontlinkedtypefaceelementspec.h)
-../inc/openfontlinkedtypefacespecification.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(graphics/openfontlinkedtypefacespecification.h)
-../inc/openfontlinkedtypefaceextension.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(graphics/openfontlinkedtypefaceextension.h)
-../inc/shaperparams.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(graphics/shaperparams.h)
-../inc/linkedfonts.h SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(linkedfonts.h)
-
-../group/fntstore.iby  /epoc32/rom/include/fntstore.iby
-
-PRJ_MMPFILES
-
-../group/FNTSTORE.MMP
-
-PRJ_TESTMMPFILES
-
-../group/TFntStoreServer.mmp  
-../group/tcachedeletionprocess.mmp 
-../group/T_WriteInvalidFontFile.mmp
-../group/T_RemoveInvalidFontFile.mmp
-../group/tfontsessioncacheproc.mmp 
-
-PRJ_TESTEXPORTS
-
-// batch file that runs all automatic fntstore tests on hardware
-../group/FntstoreTest.iby	/epoc32/rom/include/fntstoretest.iby
-../group/dummyfonts.iby		/epoc32/rom/include/dummyfonts.iby
-../group/FntStoreRebootTests.iby  /epoc32/rom/include/FntStoreRebootTests.iby
-
-../tfs/scripts/fntstoretest_run.bat				z:/fntstoretest/fntstoretest_run.bat
-../tfs/scripts/fntstoretest_run.bat				/epoc32/release/winscw/udeb/fntstoretest_run.bat
-../tfs/scripts/fntstoretest_run.bat				/epoc32/release/winscw/urel/fntstoretest_run.bat
-../tfs/scripts/fntstoretest.bat					z:/fntstoretest/fntstoretest.bat
-
-../tfs/scripts/fntstoretest_T_All.script						z:/fntstoretest/fntstoretest_t_all.script
-../tfs/scripts/fntstoretest_T_Fnt.script						z:/fntstoretest/fntstoretest_t_fnt.script
-../tfs/scripts/fntstoretest_T_Cache.script						z:/fntstoretest/fntstoretest_T_Cache.script
-../tfs/scripts/fntstoretest_T_FntMem.script						z:/fntstoretest/fntstoretest_t_fntmem.script
-../tfs/scripts/fntstoretest_T_FontBitmap.script					z:/fntstoretest/fntstoretest_t_fontbitmap.script
-../tfs/scripts/fntstoretest_T_FsOpen.script						z:/fntstoretest/fntstoretest_t_fsopen.script
-../tfs/scripts/fntstoretest_T_GlyphTreeDel.script				z:/fntstoretest/fntstoretest_t_glyphtreedel.script
-../tfs/scripts/fntstoretest_T_MatchFonts.script					z:/fntstoretest/fntstoretest_t_matchfonts.script
-../tfs/scripts/fntstoretest_T_OpenFontTypes.script				z:/fntstoretest/fntstoretest_t_openfonttypes.script
-../tfs/scripts/fntstoretest_T_FontMetrics.script				z:/fntstoretest/fntstoretest_t_fontmetrics.script
-../tfs/scripts/fntstoretest_T_GetNearestFont.script				z:/fntstoretest/fntstoretest_t_getnearestfont.script
-../tfs/scripts/fntstoretest_t_getnearestfontcapability.script	z:/fntstoretest/fntstoretest_t_getnearestfontcapability.script
-../tfs/scripts/fntstoretest_T_CorruptFonts.script				z:/fntstoretest/fntstoretest_t_corruptfonts.script
-../tfs/scripts/fntstoretest_T_ShaperCache.script				z:/fntstoretest/fntstoretest_t_shapercache.script
-../tfs/scripts/fntstoretest_T_LinkedFonts.script				z:/fntstoretest/fntstoretest_t_linkedfonts.script
-../tfs/scripts/fntstoretest_t_cachedeletion.script				z:/fntstoretest/fntstoretest_t_cachedeletion.script
-../tfs/scripts/fntstoretest_t_setdefaulttypefacename.script		z:/fntstoretest/fntstoretest_t_setdefaulttypefacename.script
-../tfs/scripts/fntstoretest_T_LinkedFontUpdateInitial.script	z:/fntstoretest/fntstoretest_T_LinkedFontUpdateInitial.script
-../tfs/scripts/fntstoretest_T_LinkedFontUpdateStage1.script		z:/fntstoretest/fntstoretest_T_LinkedFontUpdateStage1.script
-../tfs/scripts/fntstoretest_T_LinkedFontUpdateStage2.script		z:/fntstoretest/fntstoretest_T_LinkedFontUpdateStage2.script
-../tfs/scripts/fntstoretest_T_FontSessionCache.script 			z:/fntstoretest/fntstoretest_T_FontSessionCache.script
-
-../tfs/CEUROPE.GDR z:/resource/fonts/ceurope.gdr
-
-// dummy fonts for T_FSOPEN
-../tfs/dummy_fonts/dummy z:/plattest/graphics/testdata/dummy_fonts/dummy
-../tfs/dummy_fonts/dummy z:/plattest/graphics/testdata/dummy_fonts/dummy_b
-../tfs/dummy_fonts/dummy z:/plattest/graphics/testdata/dummy_fonts/dummy_i
-../tfs/dummy_fonts/dummy z:/plattest/graphics/testdata/dummy_fonts/dummy_bi
-
-// near-duplicate fonts for test  CTFntMem::TestDuplicateBitmapFontFileEntriesL
-../tfs/uniquified_fonts/XXeuro.gdr  z:/plattest/graphics/testdata/uniquified_fonts/xxeuro.gdr
-../tfs/uniquified_fonts/YYeuro.gdr  z:/plattest/graphics/testdata/uniquified_fonts/yyeuro.gdr
-
-
-// copy corrupt fonts to Z drive
-../tfs/corrupt_gdr_fonts/bad_streamid z:/plattest/graphics/testdata/corrupt_gdr_fonts/bad_streamid
-
-../tfs/corrupt_ttf_fonts/bad_entrysel z:/plattest/graphics/testdata/corrupt_ttf_fonts/bad_entrysel
-../tfs/corrupt_ttf_fonts/bad_length z:/plattest/graphics/testdata/corrupt_ttf_fonts/bad_length
-../tfs/corrupt_ttf_fonts/bad_numtables z:/plattest/graphics/testdata/corrupt_ttf_fonts/bad_numtables
-../tfs/corrupt_ttf_fonts/bad_offset z:/plattest/graphics/testdata/corrupt_ttf_fonts/bad_offset
-../tfs/corrupt_ttf_fonts/bad_rangeshift z:/plattest/graphics/testdata/corrupt_ttf_fonts/bad_rangeshift
-../tfs/corrupt_ttf_fonts/bad_searchrange z:/plattest/graphics/testdata/corrupt_ttf_fonts/bad_searchrange
-../tfs/corrupt_ttf_fonts/bad_tag_order z:/plattest/graphics/testdata/corrupt_ttf_fonts/bad_tag_order
-../tfs/corrupt_ttf_fonts/cvt_len z:/plattest/graphics/testdata/corrupt_ttf_fonts/cvt_len
-../tfs/corrupt_ttf_fonts/fpgm_len z:/plattest/graphics/testdata/corrupt_ttf_fonts/fpgm_len
-../tfs/corrupt_ttf_fonts/glyf_len z:/plattest/graphics/testdata/corrupt_ttf_fonts/glyf_len
-../tfs/corrupt_ttf_fonts/head_len z:/plattest/graphics/testdata/corrupt_ttf_fonts/head_len
-../tfs/corrupt_ttf_fonts/hhea_len z:/plattest/graphics/testdata/corrupt_ttf_fonts/hhea_len
-../tfs/corrupt_ttf_fonts/hmtx_len z:/plattest/graphics/testdata/corrupt_ttf_fonts/hmtx_len
-../tfs/corrupt_ttf_fonts/loca_len z:/plattest/graphics/testdata/corrupt_ttf_fonts/loca_len
-../tfs/corrupt_ttf_fonts/maxp_len z:/plattest/graphics/testdata/corrupt_ttf_fonts/maxp_len
-../tfs/corrupt_ttf_fonts/name_len z:/plattest/graphics/testdata/corrupt_ttf_fonts/name_len
-../tfs/corrupt_ttf_fonts/post_len z:/plattest/graphics/testdata/corrupt_ttf_fonts/post_len
-../tfs/corrupt_ttf_fonts/prep_len z:/plattest/graphics/testdata/corrupt_ttf_fonts/prep_len
-../tfs/corrupt_ttf_fonts/cmap_len z:/plattest/graphics/testdata/corrupt_ttf_fonts/cmap_len
-../tfs/corrupt_ttf_fonts/gdef_len z:/plattest/graphics/testdata/corrupt_ttf_fonts/gdef_len
-../tfs/corrupt_ttf_fonts/gpos_len z:/plattest/graphics/testdata/corrupt_ttf_fonts/gpos_len
-../tfs/corrupt_ttf_fonts/gsub_len z:/plattest/graphics/testdata/corrupt_ttf_fonts/gsub_len
-../tfs/corrupt_ttf_fonts/os2_len z:/plattest/graphics/testdata/corrupt_ttf_fonts/os2_len
-../tfs/corrupt_ttf_fonts/gasp_len z:/plattest/graphics/testdata/corrupt_ttf_fonts/gasp_len
-../tfs/corrupt_ttf_fonts/fftm_len z:/plattest/graphics/testdata/corrupt_ttf_fonts/fftm_len
-../tfs/corrupt_ttf_fonts/wrong_offset z:/plattest/graphics/testdata/corrupt_ttf_fonts/wrong_offset
-
-
-//exporting font files to epoc32
-../tfs/fntfiles/tsection.gdr		/epoc32/release/winscw/udeb/z/test/tsection.gdr
-../tfs/fntfiles/tsection.gdr		/epoc32/release/winscw/urel/z/test/tsection.gdr
-../tfs/fntfiles/tsection.gdr		/epoc32/data/z/system/test/tsection.gdr
-
-//hash file for linked fonts testing
-../tfs/scripts/tlinkedfontscomparison.ini z:/fntstoretest/tlinkedfontscomparison.ini
-../tfs/scripts/tlinkedfontscomparison_armv5.ini z:/fntstoretest/tlinkedfontscomparison_armv5.ini
-../tfs/scripts/tlinkedfontscomparison_armv5_itype.ini z:/fntstoretest/tlinkedfontscomparison_armv5_itype.ini
-
-//file for linked font capability testing
-../tfs/scripts/tlinkedfontscapability.ini z:/fntstoretest/tlinkedfontscapability.ini
-
-//file for setdefaulttypefacename panic testing
-../tfs/scripts/tsetdefaulttypefacename.ini z:/fntstoretest/tsetdefaulttypefacename.ini
-
-
-
--- a/fontservices/fontstore/group/FntstoreTest.iby	Thu Jun 24 11:18:23 2010 +0800
+++ b/fontservices/fontstore/group/FntstoreTest.iby	Thu Jun 24 11:25:56 2010 +0800
@@ -49,6 +49,7 @@
 data=DATAZ_\fntstoretest\fntstoretest_T_LinkedFontUpdateInitial.script	\fntstoretest\fntstoretest_T_LinkedFontUpdateInitial.script
 data=DATAZ_\fntstoretest\fntstoretest_T_LinkedFontUpdateStage1.script	\fntstoretest\fntstoretest_T_LinkedFontUpdateStage1.script
 data=DATAZ_\fntstoretest\fntstoretest_T_LinkedFontUpdateStage2.script	\fntstoretest\fntstoretest_T_LinkedFontUpdateStage2.script
+data=DATAZ_\fntstoretest\fntstoretest_T_Cache.script			\fntstoretest\fntstoretest_T_Cache.script
 data=DATAZ_\fntstoretest\fntstoretest_T_FontSessionCache.script			\fntstoretest\fntstoretest_T_FontSessionCache.script
 
 // FntStore test code - TFntStoreServer.exe needs to be copied into \sys\bin\ and set as data so it will be copied to the c: drive and we can change the capabilities of the .exe
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/fontservices/fontstore/group/bld.inf	Thu Jun 24 11:25:56 2010 +0800
@@ -0,0 +1,151 @@
+/*
+* Copyright (c) 2006-2010 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"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description: 
+* Font store
+*
+*/
+
+
+/**
+ @file
+*/
+
+
+
+PRJ_PLATFORMS
+
+DEFAULT
+
+PRJ_EXPORTS
+
+../inc/FNTSTORE.H SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(fntstore.h)
+../inc/OPENFONT.H SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(openfont.h)
+../inc/openfontconstants.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(graphics/openfontconstants.h)
+../inc/openfontrasterizer.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(graphics/openfontrasterizer.h)
+../inc/openfontlinkedtypefaceelementspec.h SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(openfontlinkedtypefaceelementspec.h)
+../inc/openfontlinkedtypefacespecification.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(graphics/openfontlinkedtypefacespecification.h)
+../inc/openfontlinkedtypefaceextension.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(graphics/openfontlinkedtypefaceextension.h)
+../inc/shaperparams.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(graphics/shaperparams.h)
+../inc/linkedfonts.h SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(linkedfonts.h)
+
+../group/fntstore.iby  /epoc32/rom/include/fntstore.iby
+
+PRJ_MMPFILES
+
+../group/FNTSTORE.MMP
+
+PRJ_TESTMMPFILES
+
+../group/TFntStoreServer.mmp  
+../group/tcachedeletionprocess.mmp 
+../group/T_WriteInvalidFontFile.mmp
+../group/T_RemoveInvalidFontFile.mmp
+../group/tfontsessioncacheproc.mmp 
+
+PRJ_TESTEXPORTS
+
+// batch file that runs all automatic fntstore tests on hardware
+../group/FntstoreTest.iby	/epoc32/rom/include/fntstoretest.iby
+../group/dummyfonts.iby		/epoc32/rom/include/dummyfonts.iby
+../group/FntStoreRebootTests.iby  /epoc32/rom/include/FntStoreRebootTests.iby
+
+../tfs/scripts/fntstoretest_run.bat				z:/fntstoretest/fntstoretest_run.bat
+../tfs/scripts/fntstoretest_run.bat				/epoc32/release/winscw/udeb/fntstoretest_run.bat
+../tfs/scripts/fntstoretest_run.bat				/epoc32/release/winscw/urel/fntstoretest_run.bat
+../tfs/scripts/fntstoretest.bat					z:/fntstoretest/fntstoretest.bat
+
+../tfs/scripts/fntstoretest_T_All.script						z:/fntstoretest/fntstoretest_t_all.script
+../tfs/scripts/fntstoretest_T_Fnt.script						z:/fntstoretest/fntstoretest_t_fnt.script
+../tfs/scripts/fntstoretest_T_Cache.script						z:/fntstoretest/fntstoretest_T_Cache.script
+../tfs/scripts/fntstoretest_T_FntMem.script						z:/fntstoretest/fntstoretest_t_fntmem.script
+../tfs/scripts/fntstoretest_T_FontBitmap.script					z:/fntstoretest/fntstoretest_t_fontbitmap.script
+../tfs/scripts/fntstoretest_T_FsOpen.script						z:/fntstoretest/fntstoretest_t_fsopen.script
+../tfs/scripts/fntstoretest_T_GlyphTreeDel.script				z:/fntstoretest/fntstoretest_t_glyphtreedel.script
+../tfs/scripts/fntstoretest_T_MatchFonts.script					z:/fntstoretest/fntstoretest_t_matchfonts.script
+../tfs/scripts/fntstoretest_T_OpenFontTypes.script				z:/fntstoretest/fntstoretest_t_openfonttypes.script
+../tfs/scripts/fntstoretest_T_FontMetrics.script				z:/fntstoretest/fntstoretest_t_fontmetrics.script
+../tfs/scripts/fntstoretest_T_GetNearestFont.script				z:/fntstoretest/fntstoretest_t_getnearestfont.script
+../tfs/scripts/fntstoretest_t_getnearestfontcapability.script	z:/fntstoretest/fntstoretest_t_getnearestfontcapability.script
+../tfs/scripts/fntstoretest_T_CorruptFonts.script				z:/fntstoretest/fntstoretest_t_corruptfonts.script
+../tfs/scripts/fntstoretest_T_ShaperCache.script				z:/fntstoretest/fntstoretest_t_shapercache.script
+../tfs/scripts/fntstoretest_T_LinkedFonts.script				z:/fntstoretest/fntstoretest_t_linkedfonts.script
+../tfs/scripts/fntstoretest_t_cachedeletion.script				z:/fntstoretest/fntstoretest_t_cachedeletion.script
+../tfs/scripts/fntstoretest_t_setdefaulttypefacename.script		z:/fntstoretest/fntstoretest_t_setdefaulttypefacename.script
+../tfs/scripts/fntstoretest_T_LinkedFontUpdateInitial.script	z:/fntstoretest/fntstoretest_T_LinkedFontUpdateInitial.script
+../tfs/scripts/fntstoretest_T_LinkedFontUpdateStage1.script		z:/fntstoretest/fntstoretest_T_LinkedFontUpdateStage1.script
+../tfs/scripts/fntstoretest_T_LinkedFontUpdateStage2.script		z:/fntstoretest/fntstoretest_T_LinkedFontUpdateStage2.script
+../tfs/scripts/fntstoretest_T_FontSessionCache.script 			z:/fntstoretest/fntstoretest_T_FontSessionCache.script
+
+../tfs/CEUROPE.GDR z:/resource/fonts/ceurope.gdr
+
+// dummy fonts for T_FSOPEN
+../tfs/dummy_fonts/dummy z:/plattest/graphics/testdata/dummy_fonts/dummy
+../tfs/dummy_fonts/dummy z:/plattest/graphics/testdata/dummy_fonts/dummy_b
+../tfs/dummy_fonts/dummy z:/plattest/graphics/testdata/dummy_fonts/dummy_i
+../tfs/dummy_fonts/dummy z:/plattest/graphics/testdata/dummy_fonts/dummy_bi
+
+// near-duplicate fonts for test  CTFntMem::TestDuplicateBitmapFontFileEntriesL
+../tfs/uniquified_fonts/XXeuro.gdr  z:/plattest/graphics/testdata/uniquified_fonts/xxeuro.gdr
+../tfs/uniquified_fonts/YYeuro.gdr  z:/plattest/graphics/testdata/uniquified_fonts/yyeuro.gdr
+
+
+// copy corrupt fonts to Z drive
+../tfs/corrupt_gdr_fonts/bad_streamid z:/plattest/graphics/testdata/corrupt_gdr_fonts/bad_streamid
+
+../tfs/corrupt_ttf_fonts/bad_entrysel z:/plattest/graphics/testdata/corrupt_ttf_fonts/bad_entrysel
+../tfs/corrupt_ttf_fonts/bad_length z:/plattest/graphics/testdata/corrupt_ttf_fonts/bad_length
+../tfs/corrupt_ttf_fonts/bad_numtables z:/plattest/graphics/testdata/corrupt_ttf_fonts/bad_numtables
+../tfs/corrupt_ttf_fonts/bad_offset z:/plattest/graphics/testdata/corrupt_ttf_fonts/bad_offset
+../tfs/corrupt_ttf_fonts/bad_rangeshift z:/plattest/graphics/testdata/corrupt_ttf_fonts/bad_rangeshift
+../tfs/corrupt_ttf_fonts/bad_searchrange z:/plattest/graphics/testdata/corrupt_ttf_fonts/bad_searchrange
+../tfs/corrupt_ttf_fonts/bad_tag_order z:/plattest/graphics/testdata/corrupt_ttf_fonts/bad_tag_order
+../tfs/corrupt_ttf_fonts/cvt_len z:/plattest/graphics/testdata/corrupt_ttf_fonts/cvt_len
+../tfs/corrupt_ttf_fonts/fpgm_len z:/plattest/graphics/testdata/corrupt_ttf_fonts/fpgm_len
+../tfs/corrupt_ttf_fonts/glyf_len z:/plattest/graphics/testdata/corrupt_ttf_fonts/glyf_len
+../tfs/corrupt_ttf_fonts/head_len z:/plattest/graphics/testdata/corrupt_ttf_fonts/head_len
+../tfs/corrupt_ttf_fonts/hhea_len z:/plattest/graphics/testdata/corrupt_ttf_fonts/hhea_len
+../tfs/corrupt_ttf_fonts/hmtx_len z:/plattest/graphics/testdata/corrupt_ttf_fonts/hmtx_len
+../tfs/corrupt_ttf_fonts/loca_len z:/plattest/graphics/testdata/corrupt_ttf_fonts/loca_len
+../tfs/corrupt_ttf_fonts/maxp_len z:/plattest/graphics/testdata/corrupt_ttf_fonts/maxp_len
+../tfs/corrupt_ttf_fonts/name_len z:/plattest/graphics/testdata/corrupt_ttf_fonts/name_len
+../tfs/corrupt_ttf_fonts/post_len z:/plattest/graphics/testdata/corrupt_ttf_fonts/post_len
+../tfs/corrupt_ttf_fonts/prep_len z:/plattest/graphics/testdata/corrupt_ttf_fonts/prep_len
+../tfs/corrupt_ttf_fonts/cmap_len z:/plattest/graphics/testdata/corrupt_ttf_fonts/cmap_len
+../tfs/corrupt_ttf_fonts/gdef_len z:/plattest/graphics/testdata/corrupt_ttf_fonts/gdef_len
+../tfs/corrupt_ttf_fonts/gpos_len z:/plattest/graphics/testdata/corrupt_ttf_fonts/gpos_len
+../tfs/corrupt_ttf_fonts/gsub_len z:/plattest/graphics/testdata/corrupt_ttf_fonts/gsub_len
+../tfs/corrupt_ttf_fonts/os2_len z:/plattest/graphics/testdata/corrupt_ttf_fonts/os2_len
+../tfs/corrupt_ttf_fonts/gasp_len z:/plattest/graphics/testdata/corrupt_ttf_fonts/gasp_len
+../tfs/corrupt_ttf_fonts/fftm_len z:/plattest/graphics/testdata/corrupt_ttf_fonts/fftm_len
+../tfs/corrupt_ttf_fonts/wrong_offset z:/plattest/graphics/testdata/corrupt_ttf_fonts/wrong_offset
+
+
+//exporting font files to epoc32
+../tfs/fntfiles/tsection.gdr		/epoc32/release/winscw/udeb/z/test/tsection.gdr
+../tfs/fntfiles/tsection.gdr		/epoc32/release/winscw/urel/z/test/tsection.gdr
+../tfs/fntfiles/tsection.gdr		/epoc32/data/z/system/test/tsection.gdr
+
+//hash file for linked fonts testing
+../tfs/scripts/tlinkedfontscomparison.ini z:/fntstoretest/tlinkedfontscomparison.ini
+../tfs/scripts/tlinkedfontscomparison_armv5.ini z:/fntstoretest/tlinkedfontscomparison_armv5.ini
+../tfs/scripts/tlinkedfontscomparison_armv5_itype.ini z:/fntstoretest/tlinkedfontscomparison_armv5_itype.ini
+
+//file for linked font capability testing
+../tfs/scripts/tlinkedfontscapability.ini z:/fntstoretest/tlinkedfontscapability.ini
+
+//file for setdefaulttypefacename panic testing
+../tfs/scripts/tsetdefaulttypefacename.ini z:/fntstoretest/tsetdefaulttypefacename.ini
+
+
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/fontservices/fontstore/group/t_fntstore.pkg	Thu Jun 24 11:25:56 2010 +0800
@@ -0,0 +1,53 @@
+;
+; Copyright (c) 2010 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"
+; which accompanies this distribution, and is available
+; at the URL "http:;www.eclipse.org/legal/epl-v10.html".
+;
+; Initial Contributors:
+; Nokia Corporation - initial contribution.
+;
+; Contributors:
+;
+; Description: 
+;
+
+
+;Languages
+&EN
+
+
+;Localised Vendor name
+%{"t_PTPipsuite EN"}
+
+; Vendor name
+: "t_PTPipsuite"
+
+; sample from the PC Connectivity
+; "\epoc32\data\z\testdata\scripts\mtp\t_PTPipsuite.script"-"c:\mtp\testdata\scripts\mtp\t_ptpipsuite.script"
+; "\epoc32\data\z\testdata\scripts\mtp\PTPTest.ini"-"c:\mtp\testdata\scripts\mtp\ptptest.ini"
+
+; test scripts
+; "\epoc32\data\z\fntstoretest\fntstoretest_T_All.script"-"c:\fntstoretest\fntstoretest_T_All.script"
+"\epoc32\data\z\fntstoretest\fntstoretest_T_Fnt.script"-"c:\fntstoretest\fntstoretest_T_Fnt.script"
+"\epoc32\data\z\fntstoretest\fntstoretest_T_Cache.script"-"c:\fntstoretest\fntstoretest_T_Cache.script"
+"\epoc32\data\z\fntstoretest\fntstoretest_T_FntMem.script"-"c:\fntstoretest\fntstoretest_T_FntMem.script"
+"\epoc32\data\z\fntstoretest\fntstoretest_T_FontBitmap.script"-"c:\fntstoretest\fntstoretest_T_FontBitmap.script"
+"\epoc32\data\z\fntstoretest\fntstoretest_T_FsOpen.script"-"c:\fntstoretest\fntstoretest_T_FsOpen.script"
+"\epoc32\data\z\fntstoretest\fntstoretest_T_GlyphTreeDel.script"-"c:\fntstoretest\fntstoretest_T_GlyphTreeDel.script"
+"\epoc32\data\z\fntstoretest\fntstoretest_T_MatchFonts.script"-"c:\fntstoretest\fntstoretest_T_MatchFonts.script"
+"\epoc32\data\z\fntstoretest\fntstoretest_T_OpenFontTypes.script"-"c:\fntstoretest\fntstoretest_T_OpenFontTypes.script"
+"\epoc32\data\z\fntstoretest\fntstoretest_T_FontMetrics.script"-"c:\fntstoretest\fntstoretest_T_FontMetrics.script"
+"\epoc32\data\z\fntstoretest\fntstoretest_T_GetNearestFont.script"-"c:\fntstoretest\fntstoretest_T_GetNearestFont.script"
+"\epoc32\data\z\fntstoretest\fntstoretest_t_getnearestfontcapability.script"-"c:\fntstoretest\fntstoretest_t_getnearestfontcapability.script"
+"\epoc32\data\z\fntstoretest\fntstoretest_T_CorruptFonts.script"-"c:\fntstoretest\fntstoretest_T_CorruptFonts.script"
+"\epoc32\data\z\fntstoretest\fntstoretest_T_ShaperCache.script"-"c:\fntstoretest\fntstoretest_T_ShaperCache.script"
+"\epoc32\data\z\fntstoretest\fntstoretest_T_LinkedFonts.script"-"c:\fntstoretest\fntstoretest_T_LinkedFonts.script"
+"\epoc32\data\z\fntstoretest\fntstoretest_t_cachedeletion.script"-"c:\fntstoretest\fntstoretest_t_cachedeletion.script"
+"\epoc32\data\z\fntstoretest\fntstoretest_t_setdefaulttypefacename.script"-"c:\fntstoretest\fntstoretest_t_setdefaulttypefacename.script"
+; "\epoc32\data\z\fntstoretest\fntstoretest_T_LinkedFontUpdateInitial.script"-"c:\fntstoretest\fntstoretest_T_LinkedFontUpdateInitial.script"
+; "\epoc32\data\z\fntstoretest\fntstoretest_T_LinkedFontUpdateStage1.script"-"c:\fntstoretest\fntstoretest_T_LinkedFontUpdateStage1.script"
+; "\epoc32\data\z\fntstoretest\fntstoretest_T_LinkedFontUpdateStage2.script"-"c:\fntstoretest\fntstoretest_T_LinkedFontUpdateStage2.script"
+"\epoc32\data\z\fntstoretest\fntstoretest_T_FontSessionCache.script"-"c:\fntstoretest\fntstoretest_T_FontSessionCache.script"
--- a/fontservices/referencefonts/utils/bdfharn.cpp	Thu Jun 24 11:18:23 2010 +0800
+++ b/fontservices/referencefonts/utils/bdfharn.cpp	Thu Jun 24 11:25:56 2010 +0800
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2003-2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2003-2010 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"
@@ -98,7 +98,7 @@
 
 void CBDFHarness::ConstructL()
 	{
-	RFbsSession::Connect();
+	User::LeaveIfError(RFbsSession::Connect());
 	iFbs = RFbsSession::GetSession();
 	if (iFbs == NULL)
 		User::Leave(KErrGeneral);
@@ -128,7 +128,7 @@
 	}
 
 
-void CBDFHarness::MakeBDFFont()
+void CBDFHarness::MakeBDFFontL()
 	{
 	TOpenFontFaceAttrib attrib;
 	iStandardFont->GetFaceAttrib(attrib);
@@ -140,7 +140,7 @@
 
 	// Open file session
 	RFs file_session;
-	file_session.Connect();
+	User::LeaveIfError(file_session.Connect());
 	file_session.MkDir(_L("\\BDFfonts\\"));
 	// Open file
 	RFile file;
--- a/fontservices/referencefonts/utils/bdfharn.h	Thu Jun 24 11:18:23 2010 +0800
+++ b/fontservices/referencefonts/utils/bdfharn.h	Thu Jun 24 11:25:56 2010 +0800
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2003-2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2003-2010 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"
@@ -32,7 +32,7 @@
 	public:
 	static CBDFHarness* NewL(const TDesC &aTitle, const TDesC &aHeading);
 	~CBDFHarness();
-	void MakeBDFFont();
+	void MakeBDFFontL();
 
 	void DecodeBitmap(TInt aWidth, TInt aPaddedWidth, TInt aHeight, const TUint8* aCodedBitmap, TUint8* aBitmap);
 	TInt ReadBit();
--- a/fontservices/referencefonts/utils/ttf2bdf.cpp	Thu Jun 24 11:18:23 2010 +0800
+++ b/fontservices/referencefonts/utils/ttf2bdf.cpp	Thu Jun 24 11:25:56 2010 +0800
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 1999-2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 1999-2010 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"
@@ -39,7 +39,7 @@
 
 	TRAP(error,
 	bdfHarness = CBDFHarness::NewL(_L("MAKEBDF"),_L("TTF2BDF v2 - Make bitmap BDF font from scaleable font"));
-	bdfHarness->MakeBDFFont();	
+	bdfHarness->MakeBDFFontL();	
 	delete bdfHarness;
 	__UHEAP_MARKEND;
 	);
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/layers.sysdef.xml	Thu Jun 24 11:25:56 2010 +0800
@@ -0,0 +1,185 @@
+<?xml version="1.0"?>
+<!DOCTYPE SystemDefinition [
+ <!ELEMENT SystemDefinition (systemModel?, build?)>
+ <!ATTLIST SystemDefinition
+  name CDATA #REQUIRED
+  schema CDATA #REQUIRED>
+ <!ELEMENT systemModel (layer+)>
+ <!ELEMENT layer (logicalset* | module*)*>
+ <!ATTLIST layer
+  name CDATA #REQUIRED
+  levels CDATA #IMPLIED
+  span CDATA #IMPLIED>
+ <!ELEMENT logicalset (logicalsubset* | module* | unit* | package* | prebuilt*)*>
+ <!ATTLIST logicalset 
+  name CDATA #REQUIRED
+  levels CDATA #IMPLIED  
+  span CDATA #IMPLIED
+  level CDATA #IMPLIED>
+ <!ELEMENT logicalsubset (module* | unit* | package* | prebuilt*)*>
+ <!ATTLIST logicalsubset name CDATA #REQUIRED>
+ <!ELEMENT module (component* | unit* | package* | prebuilt*)*>
+ <!ATTLIST module
+  name CDATA #REQUIRED
+  level CDATA #IMPLIED>
+ <!ELEMENT component (unit* | package* | prebuilt*)*>
+ <!ATTLIST component name CDATA #REQUIRED>
+ <!ELEMENT unit EMPTY>
+ <!ATTLIST unit
+  unitID ID #REQUIRED
+  name CDATA #REQUIRED
+  mrp CDATA #REQUIRED
+  filter CDATA #IMPLIED
+  bldFile CDATA #REQUIRED
+  priority CDATA #IMPLIED
+  contract CDATA #IMPLIED>
+ <!ELEMENT package EMPTY>
+ <!ATTLIST package
+  name CDATA #REQUIRED
+  mrp CDATA #REQUIRED
+  filter CDATA #IMPLIED
+  contract CDATA #IMPLIED>
+ <!ELEMENT prebuilt EMPTY>
+ <!ATTLIST prebuilt
+  name CDATA #REQUIRED
+  version CDATA #REQUIRED
+  late (Y|N) #IMPLIED
+  filter CDATA #IMPLIED
+  contract CDATA #IMPLIED>
+ <!ELEMENT build (option* | target+ | targetList+ | unitList+ | configuration+)*>
+ <!ELEMENT unitList (unitRef+)>
+ <!ATTLIST unitList
+  name ID #REQUIRED
+  description CDATA #REQUIRED>
+ <!ELEMENT unitRef EMPTY>
+ <!ATTLIST unitRef unit IDREF #REQUIRED>
+ <!ELEMENT targetList EMPTY>
+ <!ATTLIST targetList
+  name ID #REQUIRED
+  description CDATA #REQUIRED
+  target IDREFS #REQUIRED>
+ <!ELEMENT target EMPTY>
+ <!ATTLIST target
+  name ID #REQUIRED
+  abldTarget CDATA #REQUIRED
+  description CDATA #REQUIRED>
+ <!ELEMENT option EMPTY>
+ <!ATTLIST option
+  name ID #REQUIRED
+  abldOption CDATA #REQUIRED
+  description CDATA #REQUIRED
+  enable (Y | N | y | n) #REQUIRED>
+ <!ELEMENT configuration (unitListRef+ | layerRef+ | task+)*>
+ <!ATTLIST configuration
+  name ID #REQUIRED
+  description CDATA #REQUIRED
+  filter CDATA #REQUIRED>
+ <!ELEMENT task ( unitListRef* , (buildLayer | specialInstructions))>
+ <!ELEMENT unitListRef EMPTY>
+ <!ATTLIST unitListRef unitList IDREF #REQUIRED>
+ <!ELEMENT layerRef EMPTY>
+ <!ATTLIST layerRef layerName CDATA #REQUIRED>
+ <!ELEMENT buildLayer EMPTY>
+ <!ATTLIST buildLayer
+  command CDATA #REQUIRED
+  targetList IDREFS #IMPLIED
+  unitParallel (Y | N | y | n) #REQUIRED
+  targetParallel (Y | N | y | n) #IMPLIED>
+ <!ELEMENT specialInstructions EMPTY>
+ <!ATTLIST specialInstructions
+  name CDATA #REQUIRED
+  cwd CDATA #REQUIRED
+  command CDATA #REQUIRED>
+ <!ENTITY layer_real_source_path "/sf/os/textandloc" >
+]>
+
+<SystemDefinition name="textandloc_build" schema="1.4.0">
+  <systemModel>
+    <layer name="os_layer">
+      <!--module name="freetype">
+        <unit name="freetype" unitID="tls.freetype"  bldFile="sf\os\textandloc\fontservices\freetypefontrasteriser\group" mrp="sf\os\textandloc\fontservices\freetypefontrasteriser\group\graphics_freetype.mrp"/>
+      </module-->
+      <module name="app-framework_etext">
+        <unit name="etext" unitID="tls.etext"  bldFile="sf\os\textandloc\textrendering\texthandling\group" mrp="sf\os\textandloc\textrendering\texthandling\group\app-framework_etext.mrp"/>
+      </module>
+      <module name="app-framework_form">
+        <unit name="form" unitID="tls.form"  bldFile="sf\os\textandloc\textrendering\textformatting\group" mrp="sf\os\textandloc\textrendering\textformatting\group\app-framework_form.mrp"/>
+      </module>
+      <!--module name="app-framework_word">
+        <unit name="word" unitID="tls.word"  bldFile="sf\os\textandloc\textrendering\word\group" mrp="sf\os\textandloc\textrendering\word\group\app-framework_word.mrp"/>
+      </module-->
+      <!-- GDI is only required for Shapper test -->
+      <!--module name="graphics_gdi">
+        <unit name="graphicsgdi" unitID="tls.graphicsgdi"  bldFile="sf\os\graphics\graphicsdeviceinterface\gdi\group" mrp="sf\os\graphics\graphicsdeviceinterface\gdi\group\graphics_gdi.mrp"/>
+      </module-->
+      <module name="graphics_fntstore">
+        <unit name="fntstore" unitID="tls.fntstore"  bldFile="sf\os\textandloc\fontservices\fontstore\group" mrp="sf\os\textandloc\fontservices\fontstore\group\graphics_fntstore.mrp"/>
+      </module>
+      <!-- no need to build itype -->
+      <!-- module name="graphics_itype">
+        <unit name="itype" unitID="tls.itype"  bldFile="sf\os\graphics\fbs\itypefontrasteriser\group" mrp="sf\os\graphics\fbs\itypefontrasteriser\group\graphics_itype.mrp"/>
+      </module -->
+      <module name="iculayoutengine">
+        <unit name="iculayout" unitID="tls.iculayout"  bldFile="sf\os\textandloc\fontservices\textshaperplugin\group" mrp="sf\os\textandloc\fontservices\textshaperplugin\group\graphics_iculayoutengine.mrp"/>
+      </module>
+      <module name="referencefonts">
+        <unit name="reffonts" unitID="tls.reffonts"  bldFile="sf\os\textandloc\fontservices\referencefonts\group" mrp="sf\os\textandloc\fontservices\referencefonts\group\graphics_fonts.mrp"/>
+      </module>
+      <module name="app-framework_numberconversion">
+        <unit name="numberconv" unitID="tls.numberconv"  bldFile="sf\os\textandloc\textrendering\numberformatting\group" mrp="sf\os\textandloc\textrendering\numberformatting\group\app-framework_numberconversion.mrp"/>
+      </module>
+      <module name="base_loce32">
+        <unit name="loce32" unitID="tls.loce32"  bldFile="sf\os\textandloc\localisation\localesupport" mrp="sf\os\textandloc\localisation\localesupport\mmpfiles\base_loce32.mrp"/>
+      </module>
+      <module name="syslibs_charconv">
+        <unit name="charconv" unitID="tls.charconv"  bldFile="sf\os\textandloc\charconvfw\charconv_fw\group" mrp="sf\os\textandloc\charconvfw\charconv_fw\group\syslibs_charconv.mrp"/>
+      </module>
+      <module name="syslibs_charconv_plugins">
+        <unit name="charconvplugin" unitID="tls.charconvplugin"  bldFile="sf\os\textandloc\charconvfw\charconvplugins\group" mrp="sf\os\textandloc\charconvfw\charconvplugins\group\syslibs_charconv_plugins.mrp"/>
+      </module>
+      <module name="syslibs_fatcharsetconv">
+        <unit name="fatcharsetconv" unitID="tls.fatcharsetconv"  bldFile="sf\os\textandloc\charconvfw\fatfilenameconversionplugins\group" mrp="sf\os\textandloc\charconvfw\fatfilenameconversionplugins\group\syslibs_fatcharsetconv.mrp"/>
+      </module>
+    </layer>
+    <layer name="api_test_layer">
+      <!--module name="test.app-framework_etext">
+        <unit name="test.etext" unitID="test.tls.etext"  bldFile="sf\os\textandloc\textrendering\texthandling\group" mrp=""/>
+      </module>
+      <module name="test.app-framework_form">
+        <unit name="test.form" unitID="test.tls.form"  bldFile="sf\os\textandloc\textrendering\textformatting\group" mrp=""/>
+      </module-->
+      <module name="test.graphics_testharness">
+        <unit name="test.graphicstestharness" unitID="test.tls.graphicstestharness"  bldFile="sf\os\graphics\graphicstest\graphicstestharness\group" mrp=""/>
+      </module>
+      <!-- seems font files can not be exported -->
+      <module name="test.graphics_internaltestfonts">
+        <unit name="test.graphicsinternaltestfonts" unitID="test.tls.graphicsinternaltestfonts"  bldFile="sf\os\textandloc\fontservices\graphicstestfonts\group" mrp=""/>
+      </module>
+      <module name="test.graphics_fntstore">
+        <unit name="test.fntstore" unitID="test.tls.fntstore"  bldFile="sf\os\textandloc\fontservices\fontstore\group" mrp=""/>
+      </module>
+      <module name="test.syslibs_charconv">
+        <unit name="test.charconv" unitID="test.tls.charconv"  bldFile="sf\os\textandloc\charconvfw\charconv_fw\group" mrp="" />
+      </module>
+	  <!-- turn off hindidemo -->
+      <!--module name="test.iculayoutengine">
+        <unit name="test.iculayout" unitID="test.tls.iculayout"  bldFile="sf\os\textandloc\fontservices\textshaperplugin\group" mrp=""/>
+      </module-->
+      <!--module name="test.freetype">
+        <unit name="test.freetype" unitID="test.tls.freetype"  bldFile="sf\os\textandloc\fontservices\freetypefontrasteriser\group" mrp=""/>
+      </module-->
+      <module name="test.syslibs_charconv_plugins">
+        <unit name="test.charconvplugin" unitID="test.tls.charconvplugin"  bldFile="sf\os\textandloc\charconvfw\charconvplugins\group" mrp=""/>
+      </module>
+      <module name="test.syslibs_fatcharsetconv">
+        <unit name="test.fatcharsetconv" unitID="test.tls.fatcharsetconv"  bldFile="sf\os\textandloc\charconvfw\fatfilenameconversionplugins\group" mrp=""/>
+      </module>
+      <!--module name="test.app-framework_numberconversion">
+        <unit name="test.numberconv" unitID="test.tls.numberconv"  bldFile="sf\os\textandloc\textrendering\numberformatting\group" mrp=""/>
+      </module>
+      <module name="test.base_loce32">
+        <unit name="test.loce32" unitID="test.tls.loce32"  bldFile="sf\os\textandloc\localisation\localesupport" mrp=""/>
+      </module-->
+    </layer>
+  </systemModel>  
+</SystemDefinition>
--- a/localisation/localesupport/new_locale_dll/collation/share/locl_collation.h	Thu Jun 24 11:18:23 2010 +0800
+++ b/localisation/localesupport/new_locale_dll/collation/share/locl_collation.h	Thu Jun 24 11:25:56 2010 +0800
@@ -20,7 +20,7 @@
 #define __LOCL_COLLATION_H_
 
 #if !defined(__E32STD_H__)
-#include <E32std.h>
+#include <e32std.h>
 #endif
 
 #ifdef _UNICODE
--- a/textandlocutils/inlinetext/inc/InlineTextNoMatchesIndicatorSource.h	Thu Jun 24 11:18:23 2010 +0800
+++ b/textandlocutils/inlinetext/inc/InlineTextNoMatchesIndicatorSource.h	Thu Jun 24 11:25:56 2010 +0800
@@ -22,12 +22,12 @@
 
 // INCLUDES
 
-#include "inlinetextbase.h"
+#include "InlineTextBase.h"
 #ifndef SYMBIAN_ENABLE_SPLIT_HEADERS
 #include <tagma.h>
 #else
 #include <tagma.h>
-#include <tagmaLayoutAndSource.h>
+#include <tagmalayoutandsource.h>
 #endif
 
 // CONSTANTS
--- a/textandlocutils/jplangutil/BMARM/JPLANGUTILU.DEF	Thu Jun 24 11:18:23 2010 +0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,11 +0,0 @@
-EXPORTS
-	IsKatakana__10JPLangUtilUs @ 1 NONAME R3UNUSED ; JPLangUtil::IsKatakana(unsigned short)
-	ConvertFullToHalfWidth__10JPLangUtilRC7TDesC16R6TDes16 @ 2 NONAME R3UNUSED ; JPLangUtil::ConvertFullToHalfWidth(TDesC16 const &, TDes16 &)
-	ConvertHalfToFullWidthKatakana__10JPLangUtilRC7TDesC16R6TDes16 @ 3 NONAME R3UNUSED ; JPLangUtil::ConvertHalfToFullWidthKatakana(TDesC16 const &, TDes16 &)
-	ConvertHalfToFullWidth__10JPLangUtilRC7TDesC16R6TDes16 @ 4 NONAME R3UNUSED ; JPLangUtil::ConvertHalfToFullWidth(TDesC16 const &, TDes16 &)
-	IsFullWidth__10JPLangUtilUs @ 5 NONAME R3UNUSED ; JPLangUtil::IsFullWidth(unsigned short)
-	IsHalfWidth__10JPLangUtilUs @ 6 NONAME R3UNUSED ; JPLangUtil::IsHalfWidth(unsigned short)
-	IsHiragana__10JPLangUtilUs @ 7 NONAME R3UNUSED ; JPLangUtil::IsHiragana(unsigned short)
-	IsKanji__10JPLangUtilUs @ 8 NONAME R3UNUSED ; JPLangUtil::IsKanji(unsigned short)
-	ConvertFullToHalfWidthKatakana__10JPLangUtilRC7TDesC16R6TDes16 @ 9 NONAME R3UNUSED ; JPLangUtil::ConvertFullToHalfWidthKatakana(TDesC16 const &, TDes16 &)
-
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/textandlocutils/jplangutil/BMARM/jplangutilu.def	Thu Jun 24 11:25:56 2010 +0800
@@ -0,0 +1,11 @@
+EXPORTS
+	IsKatakana__10JPLangUtilUs @ 1 NONAME R3UNUSED ; JPLangUtil::IsKatakana(unsigned short)
+	ConvertFullToHalfWidth__10JPLangUtilRC7TDesC16R6TDes16 @ 2 NONAME R3UNUSED ; JPLangUtil::ConvertFullToHalfWidth(TDesC16 const &, TDes16 &)
+	ConvertHalfToFullWidthKatakana__10JPLangUtilRC7TDesC16R6TDes16 @ 3 NONAME R3UNUSED ; JPLangUtil::ConvertHalfToFullWidthKatakana(TDesC16 const &, TDes16 &)
+	ConvertHalfToFullWidth__10JPLangUtilRC7TDesC16R6TDes16 @ 4 NONAME R3UNUSED ; JPLangUtil::ConvertHalfToFullWidth(TDesC16 const &, TDes16 &)
+	IsFullWidth__10JPLangUtilUs @ 5 NONAME R3UNUSED ; JPLangUtil::IsFullWidth(unsigned short)
+	IsHalfWidth__10JPLangUtilUs @ 6 NONAME R3UNUSED ; JPLangUtil::IsHalfWidth(unsigned short)
+	IsHiragana__10JPLangUtilUs @ 7 NONAME R3UNUSED ; JPLangUtil::IsHiragana(unsigned short)
+	IsKanji__10JPLangUtilUs @ 8 NONAME R3UNUSED ; JPLangUtil::IsKanji(unsigned short)
+	ConvertFullToHalfWidthKatakana__10JPLangUtilRC7TDesC16R6TDes16 @ 9 NONAME R3UNUSED ; JPLangUtil::ConvertFullToHalfWidthKatakana(TDesC16 const &, TDes16 &)
+
--- a/textandlocutils/jplangutil/BWINS/JPLANGUTILU.DEF	Thu Jun 24 11:18:23 2010 +0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,12 +0,0 @@
-EXPORTS
-	?ConvertFullToHalfWidth@JPLangUtil@@SAHABVTDesC16@@AAVTDes16@@@Z @ 1 NONAME ; public: static int __cdecl JPLangUtil::ConvertFullToHalfWidth(class TDesC16 const &,class TDes16 &)
-	?ConvertFullToHalfWidthKatakana@JPLangUtil@@SAHABVTDesC16@@AAVTDes16@@@Z @ 2 NONAME ; public: static int __cdecl JPLangUtil::ConvertFullToHalfWidthKatakana(class TDesC16 const &,class TDes16 &)
-	?ConvertHalfToFullWidth@JPLangUtil@@SAHABVTDesC16@@AAVTDes16@@@Z @ 3 NONAME ; public: static int __cdecl JPLangUtil::ConvertHalfToFullWidth(class TDesC16 const &,class TDes16 &)
-	?ConvertHalfToFullWidthKatakana@JPLangUtil@@SAHABVTDesC16@@AAVTDes16@@@Z @ 4 NONAME ; public: static int __cdecl JPLangUtil::ConvertHalfToFullWidthKatakana(class TDesC16 const &,class TDes16 &)
-	?IsFullWidth@JPLangUtil@@SAHG@Z @ 5 NONAME ; public: static int __cdecl JPLangUtil::IsFullWidth(unsigned short)
-	?IsHalfWidth@JPLangUtil@@SAHG@Z @ 6 NONAME ; public: static int __cdecl JPLangUtil::IsHalfWidth(unsigned short)
-	?IsHiragana@JPLangUtil@@SAHG@Z @ 7 NONAME ; public: static int __cdecl JPLangUtil::IsHiragana(unsigned short)
-	?IsKanji@JPLangUtil@@SAHG@Z @ 8 NONAME ; public: static int __cdecl JPLangUtil::IsKanji(unsigned short)
-	?IsKatakana@JPLangUtil@@SAHG@Z @ 9 NONAME ; public: static int __cdecl JPLangUtil::IsKatakana(unsigned short)
-	?ConvertFullHiragnaToFullKatakana@JPLangUtil@@SAHABVTDesC16@@AAVTDes16@@@Z @ 10 NONAME ; int JPLangUtil::ConvertFullHiragnaToFullKatakana(class TDesC16 const &, class TDes16 &)
-
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/textandlocutils/jplangutil/BWINS/jplangutilu.def	Thu Jun 24 11:25:56 2010 +0800
@@ -0,0 +1,12 @@
+EXPORTS
+	?ConvertFullToHalfWidth@JPLangUtil@@SAHABVTDesC16@@AAVTDes16@@@Z @ 1 NONAME ; public: static int __cdecl JPLangUtil::ConvertFullToHalfWidth(class TDesC16 const &,class TDes16 &)
+	?ConvertFullToHalfWidthKatakana@JPLangUtil@@SAHABVTDesC16@@AAVTDes16@@@Z @ 2 NONAME ; public: static int __cdecl JPLangUtil::ConvertFullToHalfWidthKatakana(class TDesC16 const &,class TDes16 &)
+	?ConvertHalfToFullWidth@JPLangUtil@@SAHABVTDesC16@@AAVTDes16@@@Z @ 3 NONAME ; public: static int __cdecl JPLangUtil::ConvertHalfToFullWidth(class TDesC16 const &,class TDes16 &)
+	?ConvertHalfToFullWidthKatakana@JPLangUtil@@SAHABVTDesC16@@AAVTDes16@@@Z @ 4 NONAME ; public: static int __cdecl JPLangUtil::ConvertHalfToFullWidthKatakana(class TDesC16 const &,class TDes16 &)
+	?IsFullWidth@JPLangUtil@@SAHG@Z @ 5 NONAME ; public: static int __cdecl JPLangUtil::IsFullWidth(unsigned short)
+	?IsHalfWidth@JPLangUtil@@SAHG@Z @ 6 NONAME ; public: static int __cdecl JPLangUtil::IsHalfWidth(unsigned short)
+	?IsHiragana@JPLangUtil@@SAHG@Z @ 7 NONAME ; public: static int __cdecl JPLangUtil::IsHiragana(unsigned short)
+	?IsKanji@JPLangUtil@@SAHG@Z @ 8 NONAME ; public: static int __cdecl JPLangUtil::IsKanji(unsigned short)
+	?IsKatakana@JPLangUtil@@SAHG@Z @ 9 NONAME ; public: static int __cdecl JPLangUtil::IsKatakana(unsigned short)
+	?ConvertFullHiragnaToFullKatakana@JPLangUtil@@SAHABVTDesC16@@AAVTDes16@@@Z @ 10 NONAME ; int JPLangUtil::ConvertFullHiragnaToFullKatakana(class TDesC16 const &, class TDes16 &)
+
--- a/textandlocutils/jplangutil/EABI/jplangutilU.def	Thu Jun 24 11:18:23 2010 +0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,12 +0,0 @@
-EXPORTS
-	_ZN10JPLangUtil10IsHiraganaEt @ 1 NONAME
-	_ZN10JPLangUtil10IsKatakanaEt @ 2 NONAME
-	_ZN10JPLangUtil11IsFullWidthEt @ 3 NONAME
-	_ZN10JPLangUtil11IsHalfWidthEt @ 4 NONAME
-	_ZN10JPLangUtil22ConvertFullToHalfWidthERK7TDesC16R6TDes16 @ 5 NONAME
-	_ZN10JPLangUtil22ConvertHalfToFullWidthERK7TDesC16R6TDes16 @ 6 NONAME
-	_ZN10JPLangUtil30ConvertFullToHalfWidthKatakanaERK7TDesC16R6TDes16 @ 7 NONAME
-	_ZN10JPLangUtil30ConvertHalfToFullWidthKatakanaERK7TDesC16R6TDes16 @ 8 NONAME
-	_ZN10JPLangUtil7IsKanjiEt @ 9 NONAME
-	_ZN10JPLangUtil32ConvertFullHiragnaToFullKatakanaERK7TDesC16R6TDes16 @ 10 NONAME
-
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/textandlocutils/jplangutil/EABI/jplangutilu.def	Thu Jun 24 11:25:56 2010 +0800
@@ -0,0 +1,12 @@
+EXPORTS
+	_ZN10JPLangUtil10IsHiraganaEt @ 1 NONAME
+	_ZN10JPLangUtil10IsKatakanaEt @ 2 NONAME
+	_ZN10JPLangUtil11IsFullWidthEt @ 3 NONAME
+	_ZN10JPLangUtil11IsHalfWidthEt @ 4 NONAME
+	_ZN10JPLangUtil22ConvertFullToHalfWidthERK7TDesC16R6TDes16 @ 5 NONAME
+	_ZN10JPLangUtil22ConvertHalfToFullWidthERK7TDesC16R6TDes16 @ 6 NONAME
+	_ZN10JPLangUtil30ConvertFullToHalfWidthKatakanaERK7TDesC16R6TDes16 @ 7 NONAME
+	_ZN10JPLangUtil30ConvertHalfToFullWidthKatakanaERK7TDesC16R6TDes16 @ 8 NONAME
+	_ZN10JPLangUtil7IsKanjiEt @ 9 NONAME
+	_ZN10JPLangUtil32ConvertFullHiragnaToFullKatakanaERK7TDesC16R6TDes16 @ 10 NONAME
+
--- a/textandlocutils/jplangutil/group/bld.inf	Thu Jun 24 11:18:23 2010 +0800
+++ b/textandlocutils/jplangutil/group/bld.inf	Thu Jun 24 11:25:56 2010 +0800
@@ -44,8 +44,8 @@
 
 
 PRJ_TESTEXPORTS
-../test/group/tjplangutil.iby		CORE_MW_LAYER_IBY_EXPORT_PATH(tjplangutil.iby)
+../test/group/tJPLangUtil.iby		CORE_MW_LAYER_IBY_EXPORT_PATH(tjplangutil.iby)
 
 PRJ_TESTMMPFILES
-../test/group/tjplangutil.mmp
+../test/group/tJPLangUtil.mmp
 	
\ No newline at end of file
--- a/textandlocutils/jplangutil/group/jplangutil.mmp	Thu Jun 24 11:18:23 2010 +0800
+++ b/textandlocutils/jplangutil/group/jplangutil.mmp	Thu Jun 24 11:25:56 2010 +0800
@@ -45,4 +45,4 @@
 SOURCE          jplangutil.cpp
 
 LIBRARY         euser.lib
-DEFFILE         JPLANGUTIL.DEF
+DEFFILE         jplangutil.def
--- a/textandlocutils/numbergrouping/group/bld.inf	Thu Jun 24 11:18:23 2010 +0800
+++ b/textandlocutils/numbergrouping/group/bld.inf	Thu Jun 24 11:25:56 2010 +0800
@@ -56,7 +56,7 @@
 
 PRJ_TESTEXPORTS
 ../test/group/tnumbergrouping.iby		CORE_MW_LAYER_IBY_EXPORT_PATH(tnumbergrouping.iby)
-../test/group/101F8775.txt \epoc32\RELEASE\WINSCW\UDEB\Z\private\10202be9\101F8775.txt
+../test/group/101F8775.txt /epoc32/RELEASE/WINSCW/UDEB/Z/private/10202be9/101F8775.txt
 
 PRJ_TESTMMPFILES
 ../test/group/tnumbergrouping.mmp
--- a/textandlocutils/numbergrouping/src/NumberGrouping.cpp	Thu Jun 24 11:18:23 2010 +0800
+++ b/textandlocutils/numbergrouping/src/NumberGrouping.cpp	Thu Jun 24 11:25:56 2010 +0800
@@ -37,7 +37,7 @@
 
 const TInt KMinimumLengthToGroup = 1; // No grouping occurs if fewer than this in unformatted buffer
 
-#include <NumberGrouping.rsg>
+#include <numbergrouping.rsg>
 
 
 GLDEF_C void Panic(TNumberGroupingPanic aPanic)
--- a/textrendering/textformatting/test/src/TForm18030/TForm18030.mmp	Thu Jun 24 11:18:23 2010 +0800
+++ b/textrendering/textformatting/test/src/TForm18030/TForm18030.mmp	Thu Jun 24 11:25:56 2010 +0800
@@ -32,15 +32,15 @@
 
 START RESOURCE	TForm18030.rss
 HEADER
-TARGETPATH		\resource\apps
+TARGETPATH		/resource/apps
 end
 
 START RESOURCE	TForm18030_reg.rss
-TARGETPATH		\private\10003a3f\apps
+TARGETPATH		/private/10003a3f/apps
 END
 
 START BITMAP	tform18030.mbm
-TARGETPATH		\resource\apps
+TARGETPATH		/resource/apps
 SOURCE			c8,1 icon24.BMP icon2M.BMP icon32.BMP icon3M.BMP icon48.BMP icon4M.BMP
 END