--- a/sbsv1_os/e32toolp/group/tools_e32toolp.mrp	Mon Jun 21 16:57:06 2010 +0300
+++ b/sbsv1_os/e32toolp/group/tools_e32toolp.mrp	Thu Sep 30 14:38:30 2010 +0800
@@ -9,7 +9,7 @@
 
 binary \epoc32\tools\abld.pl
 binary \epoc32\tools\armasm2as.pl
-binary \epoc32\tools\armutl.pm
+binary \epoc32\tools\Armutl.pm
 binary \epoc32\tools\armv5smp.bsf
 binary \epoc32\tools\armv6.bsf
 binary \epoc32\tools\armv6_abiv1.bsf
@@ -18,23 +18,23 @@
 binary \epoc32\tools\armv7.bsf
 binary \epoc32\tools\bldmake.bat
 binary \epoc32\tools\bldmake.pl
-binary \epoc32\tools\bpabiutl.pm
-binary \epoc32\tools\checkgcc.pm
+binary \epoc32\tools\BPABIutl.pm
+binary \epoc32\tools\Checkgcc.pm
 binary \epoc32\tools\checksource.pl
-binary \epoc32\tools\checksource.pm
-binary \epoc32\tools\cl_arm.pm
-binary \epoc32\tools\cl_bpabi.pm
-binary \epoc32\tools\cl_codewarrior.pm
-binary \epoc32\tools\cl_edg.pm
-binary \epoc32\tools\cl_gcc.pm
-binary \epoc32\tools\cl_gccxml.pm
-binary \epoc32\tools\cl_generic.pm
-binary \epoc32\tools\cl_mingw.pm
-binary \epoc32\tools\cl_tools.pm
-binary \epoc32\tools\cl_vscw.pm
-binary \epoc32\tools\cl_win.pm
-binary \epoc32\tools\cl_x86.pm
-binary \epoc32\tools\cl_x86gcc.pm
+binary \epoc32\tools\CheckSource.pm
+binary \epoc32\tools\Cl_arm.pm
+binary \epoc32\tools\Cl_bpabi.pm
+binary \epoc32\tools\Cl_codewarrior.pm
+binary \epoc32\tools\Cl_edg.pm
+binary \epoc32\tools\Cl_gcc.pm
+binary \epoc32\tools\Cl_gccxml.pm
+binary \epoc32\tools\Cl_generic.pm
+binary \epoc32\tools\Cl_mingw.pm
+binary \epoc32\tools\Cl_tools.pm
+binary \epoc32\tools\Cl_vscw.pm
+binary \epoc32\tools\Cl_win.pm
+binary \epoc32\tools\Cl_x86.pm
+binary \epoc32\tools\Cl_x86gcc.pm
 binary \epoc32\tools\conv_khronos_hdr_to_cpp.pl
 binary \epoc32\tools\conv_khronos_openvg_hdr_to_cpp.pl
 binary \epoc32\tools\copyfeaturevariants.pl
@@ -45,12 +45,12 @@
 binary \epoc32\tools\cw_project_template_v4.xml
 binary \epoc32\tools\default_plats.txt
 binary \epoc32\tools\default_plats_v2.txt
-binary \epoc32\tools\defutl.pm
+binary \epoc32\tools\Defutl.pm
 binary \epoc32\tools\deletefeaturevariants.pl
-binary \epoc32\tools\e32env.pm
-binary \epoc32\tools\e32plat.pm
-binary \epoc32\tools\e32tpver.pm
-binary \epoc32\tools\e32variant.pm
+binary \epoc32\tools\E32env.pm
+binary \epoc32\tools\E32Plat.pm
+binary \epoc32\tools\E32tpver.pm
+binary \epoc32\tools\E32Variant.pm
 binary \epoc32\tools\ecopyfile.pl
 binary \epoc32\tools\efreeze.bat
 binary \epoc32\tools\efreeze.pl
@@ -61,7 +61,7 @@
 binary \epoc32\tools\epocrc.pl
 binary \epoc32\tools\ermdir.pl
 binary \epoc32\tools\err_formatter.pl
-binary \epoc32\tools\fcloggerutl.pm
+binary \epoc32\tools\FCLoggerUTL.pm
 binary \epoc32\tools\featurevariantmap.pm
 binary \epoc32\tools\featurevariantparser.pm
 binary \epoc32\tools\filenamepolicyexclusions.txt
@@ -73,40 +73,40 @@
 binary \epoc32\tools\gccev7.bsf
 binary \epoc32\tools\gendef.pl
 binary \epoc32\tools\genshimsrc.bat
-binary \epoc32\tools\genutl.pm
+binary \epoc32\tools\Genutl.pm
 binary \epoc32\tools\h2inc.pl
-binary \epoc32\tools\ide_cw.pm
-binary \epoc32\tools\ide_vc6.pm
+binary \epoc32\tools\Ide_cw.pm
+binary \epoc32\tools\Ide_vc6.pm
 binary \epoc32\tools\linkdeps.pl
 binary \epoc32\tools\listfeaturevariants.pl
 binary \epoc32\tools\listzip.pl
 binary \epoc32\tools\lockit_info.pm
-binary \epoc32\tools\makdeps.pm
+binary \epoc32\tools\Makdeps.pm
 binary \epoc32\tools\make.exe
 binary \epoc32\tools\makedef.pl
-binary \epoc32\tools\makhelp.pm
+binary \epoc32\tools\Makhelp.pm
 binary \epoc32\tools\makmake.bat
 binary \epoc32\tools\makmake.pl
 binary \epoc32\tools\memtrace.bat
 binary \epoc32\tools\memtrace.pl
 binary \epoc32\tools\metabld.bat
 binary \epoc32\tools\metabld.pl
-binary \epoc32\tools\mmp.pm
-binary \epoc32\tools\modload.pm
+binary \epoc32\tools\Mmp.pm
+binary \epoc32\tools\Modload.pm
 binary \epoc32\tools\omapsig.pl
-binary \epoc32\tools\output.pm
-binary \epoc32\tools\pathutl.pm
+binary \epoc32\tools\Output.pm
+binary \epoc32\tools\Pathutl.pm
 binary \epoc32\tools\prepdef.pl
-binary \epoc32\tools\prepfile.pm
-binary \epoc32\tools\preprocessor.pm
-binary \epoc32\tools\rvct_plat2set.pm
-binary \epoc32\tools\rvct_ver2set.pm
+binary \epoc32\tools\Prepfile.pm
+binary \epoc32\tools\Preprocessor.pm
+binary \epoc32\tools\RVCT_plat2set.pm
+binary \epoc32\tools\RVCT_ver2set.pm
 binary \epoc32\tools\scpp.exe
 binary \epoc32\tools\selectbootmak.pl
 binary \epoc32\tools\set-rvct.bat
 binary \epoc32\tools\sym_lkup_util.pl
-binary \epoc32\tools\trgtype.pm
-binary \epoc32\tools\winutl.pm
+binary \epoc32\tools\Trgtype.pm
+binary \epoc32\tools\Winutl.pm
 binary \epoc32\tools\wrappermakefile.pm
 binary \epoc32\tools\compilation_config\ARMV5.mk
 binary \epoc32\tools\compilation_config\GCCE.mk
@@ -121,17 +121,17 @@
 binary \epoc32\tools\makefile_templates\app-services\wlddatabasekit_sec.mk
 binary \epoc32\tools\makefile_templates\application-protocols\buildstubsis.meta
 binary \epoc32\tools\makefile_templates\application-protocols\buildstubsis.mk
+binary \epoc32\tools\makefile_templates\base\base_rvct_common.mk
+binary \epoc32\tools\makefile_templates\base\bootstrap.flm
 binary \epoc32\tools\makefile_templates\base\bootstrap.meta
 binary \epoc32\tools\makefile_templates\base\bootstrap.mk
 binary \epoc32\tools\makefile_templates\base\bootstrap.xml
-binary \epoc32\tools\makefile_templates\base\bootstrap.flm
 binary \epoc32\tools\makefile_templates\base\config.meta
 binary \epoc32\tools\makefile_templates\base\config.mk
 binary \epoc32\tools\makefile_templates\base\copy_default.meta
 binary \epoc32\tools\makefile_templates\base\copy_default.mk
 binary \epoc32\tools\makefile_templates\base\genexec.meta
 binary \epoc32\tools\makefile_templates\base\genexec.mk
-binary \epoc32\tools\makefile_templates\base\base_rvct_common.mk
 binary \epoc32\tools\makefile_templates\base\h2_genbootinc.meta
 binary \epoc32\tools\makefile_templates\base\h2_genbootinc.mk
 binary \epoc32\tools\makefile_templates\base\h2_restricted_coreldr.meta
@@ -148,10 +148,10 @@
 binary \epoc32\tools\makefile_templates\base\integrator_lmnand2_coreldr.mk
 binary \epoc32\tools\makefile_templates\base\integrator_lmnand2_miniboot.meta
 binary \epoc32\tools\makefile_templates\base\integrator_lmnand2_miniboot.mk
+binary \epoc32\tools\makefile_templates\base\lab_restricted_miniboot.flm
 binary \epoc32\tools\makefile_templates\base\lab_restricted_miniboot.meta
 binary \epoc32\tools\makefile_templates\base\lab_restricted_miniboot.mk
 binary \epoc32\tools\makefile_templates\base\lab_restricted_miniboot.xml
-binary \epoc32\tools\makefile_templates\base\lab_restricted_miniboot.flm
 binary \epoc32\tools\makefile_templates\base\lubbock_coreldr.meta
 binary \epoc32\tools\makefile_templates\base\lubbock_coreldr.mk
 binary \epoc32\tools\makefile_templates\base\lubbock_miniboot.meta
@@ -160,16 +160,16 @@
 binary \epoc32\tools\makefile_templates\base\nand_fbr_offset.mk
 binary \epoc32\tools\makefile_templates\base\ne1_tb_genbootinc.meta
 binary \epoc32\tools\makefile_templates\base\ne1_tb_genbootinc.mk
+binary \epoc32\tools\makefile_templates\base\ne1_tb_restricted_coreldr.flm
 binary \epoc32\tools\makefile_templates\base\ne1_tb_restricted_coreldr.meta
 binary \epoc32\tools\makefile_templates\base\ne1_tb_restricted_coreldr.mk
 binary \epoc32\tools\makefile_templates\base\ne1_tb_restricted_coreldr.xml
-binary \epoc32\tools\makefile_templates\base\ne1_tb_restricted_coreldr.flm
 binary \epoc32\tools\makefile_templates\base\omap3_genbootinc.meta
 binary \epoc32\tools\makefile_templates\base\omap3_genbootinc.mk
+binary \epoc32\tools\makefile_templates\base\omap3_restricted_coreldr.flm
 binary \epoc32\tools\makefile_templates\base\omap3_restricted_coreldr.meta
 binary \epoc32\tools\makefile_templates\base\omap3_restricted_coreldr.mk
 binary \epoc32\tools\makefile_templates\base\omap3_restricted_coreldr.xml
-binary \epoc32\tools\makefile_templates\base\omap3_restricted_coreldr.flm
 binary \epoc32\tools\makefile_templates\converged-comms\createcommdbs.meta
 binary \epoc32\tools\makefile_templates\converged-comms\createcommdbs.mk
 binary \epoc32\tools\makefile_templates\converged-comms\installdefaultcommdb.meta
@@ -242,8 +242,10 @@
 binary \epoc32\tools\makefile_templates\syslibs\word_template.mk
 binary \epoc32\tools\makefile_templates\techview\uiklaf_resource.meta
 binary \epoc32\tools\makefile_templates\techview\uiklaf_resource.mk
+binary \epoc32\tools\makefile_templates\tools\ant_launch.flm
 binary \epoc32\tools\makefile_templates\tools\ant_launch.meta
 binary \epoc32\tools\makefile_templates\tools\ant_launch.mk
+binary \epoc32\tools\makefile_templates\tools\ant_launch.xml
 binary \epoc32\tools\makefile_templates\tools\bldex.meta
 binary \epoc32\tools\makefile_templates\tools\bldex.mk
 binary \epoc32\tools\makefile_templates\tools\compsupp.meta
@@ -262,10 +264,6 @@
 binary \epoc32\tools\makefile_templates\tools\stlport.mk
 binary \epoc32\tools\makefile_templates\tools\x86tool.meta
 binary \epoc32\tools\makefile_templates\tools\x86tool.mk
-binary \epoc32\tools\makefile_templates\tools\abld_update.meta
-binary \epoc32\tools\makefile_templates\tools\abld_update.mk
-binary \epoc32\tools\makefile_templates\tools\ant_launch.flm
-binary \epoc32\tools\makefile_templates\tools\ant_launch.xml
 binary \epoc32\tools\java\symbianant.jar
 binary \epoc32\tools\shell\cmd.mk
 binary \epoc32\tools\shell\generic.mk