# HG changeset patch
# User Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
# Date 1268401792 -7200
# Node ID 195bcca3f67000271875e1f8b69ddff0501ff3b0
# Parent  72c313936b0227a309d2fcc7d2c22fe64895f1d0
Revision: 201008
Kit: 201008

diff -r 72c313936b02 -r 195bcca3f670 Version/data/sw.txt
Binary file Version/data/sw.txt has changed
diff -r 72c313936b02 -r 195bcca3f670 layers.sysdef.xml
--- a/layers.sysdef.xml	Sat Feb 20 00:02:00 2010 +0200
+++ b/layers.sysdef.xml	Fri Mar 12 15:49:52 2010 +0200
@@ -12,7 +12,20 @@
       <module name="version">
         <unit unitID="platform.version" mrp="" bldFile="&layer_real_source_path;/Version/group" name="version" />
       </module>
+			<!-- from buildplatform -->
+			<module name="sf_common_tsy">
+				<component name="sf_common_tsy">
+					<unit unitID="symbian.common_tsy" name="sf_common_tsy" bldFile="sf/os/cellularsrv/telephonyserverplugins/common_tsy/group" mrp="" filter=""/>
+				</component>
+			</module>
+			<module name="sf_openvg11">
+				<component name="sf_openvg11">
+					<unit unitID="symbian.openvg11" name="sf_openvg11" bldFile="sf/os/graphics/openvg/openvginterface/group/openvg11" mrp="" filter="sf_build"/>
+				</component>
+			</module>
+			<!-- from buildplatform -->
     </layer>
+    
     <layer name="app_layer">
       <module name="locfiles">
 				<unit unitID="platform.locfiles" mrp="" bldFile="&layer_real_source_path;/locfiles/group" filter="" name="locfiles" />
@@ -36,6 +49,22 @@
       <module name="helps_loc2">
         <unit unitID="platform.helps_loc2" mrp="" bldFile="&layer_real_source_path;/helps_loc2/group" name="helps_loc2" />
       </module>
+		</layer>
+
+		<!-- from buildplatform -->
+	  <layer name="stubs_layer">
+			<module name="sf_licenseetsystub">
+				<component name="sf_licenseetsystub">
+					<unit unitID="symbian.licenseetsystub" name="sf_licenseetsystub" bldFile="sf/os/cellularsrv/telephonyserverplugins/licenseetsystub/group" mrp="" filter=""/>
+				</component>
+			</module>
+		</layer>
+
+    <layer name="bin_layer">
+			<module name="bin_layer_helix_ren">
+					<unit unitID="bin_layer_sf_mw_helix_helix_ren_src" name="src" bldFile="sf/mw/helix/helix_ren/src/group" mrp="" filter="!no_binonly"/>
+			</module>
     </layer>
+		<!-- from buildplatform -->
   </systemModel>
 </SystemDefinition>
diff -r 72c313936b02 -r 195bcca3f670 locfiles/data/01.zip
Binary file locfiles/data/01.zip has changed
diff -r 72c313936b02 -r 195bcca3f670 locfiles/data/02.zip
Binary file locfiles/data/02.zip has changed
diff -r 72c313936b02 -r 195bcca3f670 locfiles/data/03.zip
Binary file locfiles/data/03.zip has changed
diff -r 72c313936b02 -r 195bcca3f670 locfiles/data/04.zip
Binary file locfiles/data/04.zip has changed
diff -r 72c313936b02 -r 195bcca3f670 locfiles/data/05.zip
Binary file locfiles/data/05.zip has changed
diff -r 72c313936b02 -r 195bcca3f670 locfiles/data/06.zip
Binary file locfiles/data/06.zip has changed
diff -r 72c313936b02 -r 195bcca3f670 locfiles/data/07.zip
Binary file locfiles/data/07.zip has changed
diff -r 72c313936b02 -r 195bcca3f670 locfiles/data/08.zip
Binary file locfiles/data/08.zip has changed
diff -r 72c313936b02 -r 195bcca3f670 locfiles/data/09.zip
Binary file locfiles/data/09.zip has changed
diff -r 72c313936b02 -r 195bcca3f670 locfiles/data/10.zip
Binary file locfiles/data/10.zip has changed
diff -r 72c313936b02 -r 195bcca3f670 locfiles/data/102.zip
Binary file locfiles/data/102.zip has changed
diff -r 72c313936b02 -r 195bcca3f670 locfiles/data/103.zip
Binary file locfiles/data/103.zip has changed
diff -r 72c313936b02 -r 195bcca3f670 locfiles/data/129.zip
Binary file locfiles/data/129.zip has changed
diff -r 72c313936b02 -r 195bcca3f670 locfiles/data/13.zip
Binary file locfiles/data/13.zip has changed
diff -r 72c313936b02 -r 195bcca3f670 locfiles/data/14.zip
Binary file locfiles/data/14.zip has changed
diff -r 72c313936b02 -r 195bcca3f670 locfiles/data/14346.zip
Binary file locfiles/data/14346.zip has changed
diff -r 72c313936b02 -r 195bcca3f670 locfiles/data/14387.zip
Binary file locfiles/data/14387.zip has changed
diff -r 72c313936b02 -r 195bcca3f670 locfiles/data/14412.zip
Binary file locfiles/data/14412.zip has changed
diff -r 72c313936b02 -r 195bcca3f670 locfiles/data/14419.zip
Binary file locfiles/data/14419.zip has changed
diff -r 72c313936b02 -r 195bcca3f670 locfiles/data/15.zip
Binary file locfiles/data/15.zip has changed
diff -r 72c313936b02 -r 195bcca3f670 locfiles/data/157.zip
Binary file locfiles/data/157.zip has changed
diff -r 72c313936b02 -r 195bcca3f670 locfiles/data/158.zip
Binary file locfiles/data/158.zip has changed
diff -r 72c313936b02 -r 195bcca3f670 locfiles/data/159.zip
Binary file locfiles/data/159.zip has changed
diff -r 72c313936b02 -r 195bcca3f670 locfiles/data/16.zip
Binary file locfiles/data/16.zip has changed
diff -r 72c313936b02 -r 195bcca3f670 locfiles/data/160.zip
Binary file locfiles/data/160.zip has changed
diff -r 72c313936b02 -r 195bcca3f670 locfiles/data/161.zip
Binary file locfiles/data/161.zip has changed
diff -r 72c313936b02 -r 195bcca3f670 locfiles/data/17.zip
Binary file locfiles/data/17.zip has changed
diff -r 72c313936b02 -r 195bcca3f670 locfiles/data/18.zip
Binary file locfiles/data/18.zip has changed
diff -r 72c313936b02 -r 195bcca3f670 locfiles/data/230.zip
Binary file locfiles/data/230.zip has changed
diff -r 72c313936b02 -r 195bcca3f670 locfiles/data/25.zip
Binary file locfiles/data/25.zip has changed
diff -r 72c313936b02 -r 195bcca3f670 locfiles/data/26.zip
Binary file locfiles/data/26.zip has changed
diff -r 72c313936b02 -r 195bcca3f670 locfiles/data/27.zip
Binary file locfiles/data/27.zip has changed
diff -r 72c313936b02 -r 195bcca3f670 locfiles/data/28.zip
Binary file locfiles/data/28.zip has changed
diff -r 72c313936b02 -r 195bcca3f670 locfiles/data/29.zip
Binary file locfiles/data/29.zip has changed
diff -r 72c313936b02 -r 195bcca3f670 locfiles/data/30.zip
Binary file locfiles/data/30.zip has changed
diff -r 72c313936b02 -r 195bcca3f670 locfiles/data/31.zip
Binary file locfiles/data/31.zip has changed
diff -r 72c313936b02 -r 195bcca3f670 locfiles/data/32.zip
Binary file locfiles/data/32.zip has changed
diff -r 72c313936b02 -r 195bcca3f670 locfiles/data/326.zip
Binary file locfiles/data/326.zip has changed
diff -r 72c313936b02 -r 195bcca3f670 locfiles/data/327.zip
Binary file locfiles/data/327.zip has changed
diff -r 72c313936b02 -r 195bcca3f670 locfiles/data/33.zip
Binary file locfiles/data/33.zip has changed
diff -r 72c313936b02 -r 195bcca3f670 locfiles/data/37.zip
Binary file locfiles/data/37.zip has changed
diff -r 72c313936b02 -r 195bcca3f670 locfiles/data/39.zip
Binary file locfiles/data/39.zip has changed
diff -r 72c313936b02 -r 195bcca3f670 locfiles/data/42.zip
Binary file locfiles/data/42.zip has changed
diff -r 72c313936b02 -r 195bcca3f670 locfiles/data/44.zip
Binary file locfiles/data/44.zip has changed
diff -r 72c313936b02 -r 195bcca3f670 locfiles/data/45.zip
Binary file locfiles/data/45.zip has changed
diff -r 72c313936b02 -r 195bcca3f670 locfiles/data/49.zip
Binary file locfiles/data/49.zip has changed
diff -r 72c313936b02 -r 195bcca3f670 locfiles/data/50.zip
Binary file locfiles/data/50.zip has changed
diff -r 72c313936b02 -r 195bcca3f670 locfiles/data/51.zip
Binary file locfiles/data/51.zip has changed
diff -r 72c313936b02 -r 195bcca3f670 locfiles/data/54.zip
Binary file locfiles/data/54.zip has changed
diff -r 72c313936b02 -r 195bcca3f670 locfiles/data/57.zip
Binary file locfiles/data/57.zip has changed
diff -r 72c313936b02 -r 195bcca3f670 locfiles/data/58.zip
Binary file locfiles/data/58.zip has changed
diff -r 72c313936b02 -r 195bcca3f670 locfiles/data/59.zip
Binary file locfiles/data/59.zip has changed
diff -r 72c313936b02 -r 195bcca3f670 locfiles/data/65.zip
Binary file locfiles/data/65.zip has changed
diff -r 72c313936b02 -r 195bcca3f670 locfiles/data/67.zip
Binary file locfiles/data/67.zip has changed
diff -r 72c313936b02 -r 195bcca3f670 locfiles/data/68.zip
Binary file locfiles/data/68.zip has changed
diff -r 72c313936b02 -r 195bcca3f670 locfiles/data/70.zip
Binary file locfiles/data/70.zip has changed
diff -r 72c313936b02 -r 195bcca3f670 locfiles/data/76.zip
Binary file locfiles/data/76.zip has changed
diff -r 72c313936b02 -r 195bcca3f670 locfiles/data/78.zip
Binary file locfiles/data/78.zip has changed
diff -r 72c313936b02 -r 195bcca3f670 locfiles/data/79.zip
Binary file locfiles/data/79.zip has changed
diff -r 72c313936b02 -r 195bcca3f670 locfiles/data/83.zip
Binary file locfiles/data/83.zip has changed
diff -r 72c313936b02 -r 195bcca3f670 locfiles/data/93.zip
Binary file locfiles/data/93.zip has changed
diff -r 72c313936b02 -r 195bcca3f670 locfiles/data/94.zip
Binary file locfiles/data/94.zip has changed
diff -r 72c313936b02 -r 195bcca3f670 locfiles/data/96.zip
Binary file locfiles/data/96.zip has changed
diff -r 72c313936b02 -r 195bcca3f670 locfiles/group/switch_loc.zip
Binary file locfiles/group/switch_loc.zip has changed
diff -r 72c313936b02 -r 195bcca3f670 sf_build/sf_prebuild/makefile
--- a/sf_build/sf_prebuild/makefile	Sat Feb 20 00:02:00 2010 +0200
+++ b/sf_build/sf_prebuild/makefile	Fri Mar 12 15:49:52 2010 +0200
@@ -7,8 +7,8 @@
 
 include /sf/os/devicesrv/devicesrv_pub/common_platform_security_definitions_api/makefile
 include /sf/os/devicesrv/devicesrv_pub/platform_path_definitions_api/makefile
-include /sf/tools/buildplatforms/build/makefile
-include /sf/mw/qt/group/cmaker/makefile
+include /sf/mw/qt/src/s60installs/deviceconfiguration/cmaker/makefile
+
 ifeq (S60,$(BUILD))
 include /sf/mw/uiresources/uigraphics/icons/makefile
 include /sf/mw/uiresources/uigraphics/bitmaps2/makefile
@@ -17,7 +17,7 @@
 endif
  
 # Place the first target as the default target which is executed from this level 
-s60_prebuild  :: commonengine_all platform_path_all common_platform_security_all buildpreparation_all export_template_files icons_all bitmaps_all dtdinstaller_all
-os_prebuild  :: commonengine_all platform_path_all common_platform_security_all buildpreparation_all 
+s60_prebuild  :: commonengine_all platform_path_all common_platform_security_all export_template_files icons_all bitmaps_all dtdinstaller_all
+os_prebuild  :: commonengine_all platform_path_all common_platform_security_all  
 
 # include include_template.mk 
\ No newline at end of file
diff -r 72c313936b02 -r 195bcca3f670 symbianosbld/cedarutils/Symbian_OS_vFuture_Schedule12.xml
--- a/symbianosbld/cedarutils/Symbian_OS_vFuture_Schedule12.xml	Sat Feb 20 00:02:00 2010 +0200
+++ b/symbianosbld/cedarutils/Symbian_OS_vFuture_Schedule12.xml	Fri Mar 12 15:49:52 2010 +0200
@@ -4,7 +4,7 @@
 <Schedule12 Schema="2.0.0" 
 	Status="DRAFT" 
 	OS_version="tb101sf" Release_type="Update" 
-	DocVersion="$Change: 1759077 $ $DateTime: 2010/01/29 13:01:47 $ $Id: //SSS/release/sf/tb92/os/deviceplatformrelease/symbianosbld/cedarutils/Symbian_OS_vFuture_Schedule12.xml#23 $" >
+	DocVersion="$Change: 1762010 $ $DateTime: 2010/02/12 16:02:11 $ $Id: //SSS/release/sf/tb92/os/deviceplatformrelease/symbianosbld/cedarutils/Symbian_OS_vFuture_Schedule12.xml#41 $" >
 <OR name="Alarm Server">
 	Maintains a queue of all system-wide alarms and provides APIs to manage alarms
 	<system_model entry="Alarm Server"/>
diff -r 72c313936b02 -r 195bcca3f670 symbianosbld/cedarutils/Symbian_OS_vtb101sf_Schedule12.xml
--- a/symbianosbld/cedarutils/Symbian_OS_vtb101sf_Schedule12.xml	Sat Feb 20 00:02:00 2010 +0200
+++ b/symbianosbld/cedarutils/Symbian_OS_vtb101sf_Schedule12.xml	Fri Mar 12 15:49:52 2010 +0200
@@ -4,7 +4,7 @@
 <Schedule12 Schema="2.0.0" 
 	Status="DRAFT" 
 	OS_version="tb101sf" Release_type="Update" 
-	DocVersion="$Change: 1759077 $ $DateTime: 2010/01/29 13:01:47 $ $Id: //SSS/release/sf/tb92/os/deviceplatformrelease/symbianosbld/cedarutils/Symbian_OS_vtb101sf_Schedule12.xml#23 $" >
+	DocVersion="$Change: 1762010 $ $DateTime: 2010/02/12 16:02:11 $ $Id: //SSS/release/sf/tb92/os/deviceplatformrelease/symbianosbld/cedarutils/Symbian_OS_vtb101sf_Schedule12.xml#41 $" >
 <OR name="Alarm Server">
 	Maintains a queue of all system-wide alarms and provides APIs to manage alarms
 	<system_model entry="Alarm Server"/>
diff -r 72c313936b02 -r 195bcca3f670 symbianosbld/cedarutils/Symbian_OS_vtb92sf.xml
--- a/symbianosbld/cedarutils/Symbian_OS_vtb92sf.xml	Sat Feb 20 00:02:00 2010 +0200
+++ b/symbianosbld/cedarutils/Symbian_OS_vtb92sf.xml	Fri Mar 12 15:49:52 2010 +0200
@@ -64,13 +64,13 @@
 	<!-- Install cbr tools from latest green tcl build by sf zip package  -->
 	<Execute Component="Make temporary epoc32/relinfo Dir" Cwd="%BuildDir%" CommandLine="mkdir %EPOCROOT%epoc32\relinfo"/>
     <Execute Component="Get TCL sfreltools.ini" Cwd="%BuildDir%" CommandLine="copy %CleanSourceDir%\os\buildtools\bldsystemtools\commonbldutils\TCL_Support\sfreltools.ini %EPOCROOT%epoc32\relinfo\reltools.ini"/>
-    <Execute Component="Unzip zip package of cbr tools" Cwd="%BuildDir%" CommandLine="perl %CleanSourceDir%\os\buildtools\bldsystemtools\commonbldutils\GetDPComp\unzip_cbr_tools.pl -tcl_delta_cache %TCLDeltaCache% -log_dir %LogsDir% -product dp -number 11 -version DP00572"/>
+    <Execute Component="Unzip zip package of cbr tools" Cwd="%BuildDir%" CommandLine="perl %CleanSourceDir%\os\buildtools\bldsystemtools\commonbldutils\GetDPComp\unzip_cbr_tools.pl -tcl_delta_cache %TCLDeltaCache% -log_dir %LogsDir% -product dp -number 11"/>
 	<Execute Component="Copy cbr tools to own directory" Cwd="%BuildDir%" CommandLine="xcopy &quot;cbr tools&quot; \reltools\ /E /R /Y"/>
 	<Execute Component="Remove cbr tools directory" Cwd="%BuildDir%" CommandLine="rd &quot;cbr tools&quot; /s /q"/>
     <Execute Component="Publish cbrtools_unzip.log" Cwd="%LogsDir%" CommandLine="copy cbrtools_unzip.log %PublishLocation%\%Type%\%BuildNumber%\logs\"/>
 	
     <!-- Install SBSv2 -->
-    <Execute Component="Get Raptor related components" Cwd="%BuildDir%" CommandLine="perl %CleanSourceDir%\os\buildtools\bldsystemtools\commonbldutils\GetDPComp\GetDPComp.pl -c dev_build_sbsv2_raptor -c dev_build_sbsv2_cpp-raptor -c dev_hostenv_dist_cygwin-1.5.25 -c dev_hostenv_dist_mingw-5.1.4 -c dev_hostenv_pythontoolsplat_python-2.5.2 -bv DP00572_DeveloperProduct -o %LogsDir%\raptor_version.txt"/>
+    <Execute Component="Get Raptor related components" Cwd="%BuildDir%" CommandLine="perl %CleanSourceDir%\os\buildtools\bldsystemtools\commonbldutils\GetDPComp\GetDPComp.pl -c dev_build_sbsv2_raptor -c dev_build_sbsv2_cpp-raptor -c dev_hostenv_dist_cygwin-1.5.25 -c dev_hostenv_dist_mingw-5.1.4 -c dev_hostenv_pythontoolsplat_python-2.5.2 -bv green -o %LogsDir%\raptor_version.txt"/>
     <Execute Component="Copy SBSv2 to own directory" Cwd="%BuildDir%" CommandLine="perl %CleanSourceDir%\os\buildtools\bldsystemtools\commonbldutils\bxcopy.pl  -s %SBS_SRC%  -t %SBS_HOME%"/>
     <Execute Component="Remove Raptor related components" Cwd="%BuildDir%" CommandLine="perl %CleanSourceDir%\os\buildtools\bldsystemtools\commonbldutils\RmInstalledEnv.pl -x  %LogsDir%\raptor_version.txt"/>
 	<Execute Component="Remove epoc32 directory" Cwd="%BuildDir%" CommandLine="rd %EPOCROOT%epoc32 /s /q"/>
@@ -240,23 +240,23 @@
     <Execute Component="e32toolp Build" Cwd="%BuildDir%" CommandLine="sbs --filters=FilterSquashlog  -t 3 -j %MAX_CONCURRENT% -k -m %EPOCROOT%epoc32\build\Makefile_e32toolp -f %LogsDir%\sbs_e32toolp_log.xml.log -b %SourceDir%\os\buildtools\sbsv1_os\e32toolp\group\bld.inf -c tools2_rel.vtb92.whatlog -i > %LogsDir%\e32toolp.log 2>&amp;1"/>
     <Execute Component="Generate html log for e32toolp" Cwd="%EPOCROOT%tools" CommandLine="perl %EPOCROOT%tools\sbsv2htmlscanlog.pl -l %LogsDir%\sbs_e32toolp_log.xml.log  -o %LogsDir%\sbs_e32toolp_log.html -v -v "/>
     <Execute Component="Copy TCL reltools.ini to get rcomp" Cwd="%BuildDir%" CommandLine="copy %CleanSourceDir%\os\buildtools\bldsystemtools\commonbldutils\TCL_Support\sfreltools.ini %EPOCROOT%epoc32\relinfo\reltools.ini"/>
-    <Execute Component="Get latest Rcomp component from TCL" Cwd="%BuildDir%" CommandLine="perl %CleanSourceDir%\os\buildtools\bldsystemtools\commonbldutils\GetDPComp\GetDPComp.pl -s -c dev_build_bintools_rcomp -bv DP00572_DeveloperProduct -o %LogsDir%\rcomp_version.txt 2>&amp;1"/>
-    <Execute Component="Get Latest Green Trace Compiler from TCL" Cwd="%BuildDir%" CommandLine="perl %CleanSourceDir%\os\buildtools\bldsystemtools\commonbldutils\GetDPComp\GetDPComp.pl -c osttracecompiler -bv DP00572_DeveloperProduct -o %LogsDir%\tracecompiler_version.txt 2>&amp;1"/>    
+    <Execute Component="Get latest Rcomp component from TCL" Cwd="%BuildDir%" CommandLine="perl %CleanSourceDir%\os\buildtools\bldsystemtools\commonbldutils\GetDPComp\GetDPComp.pl -s -c dev_build_bintools_rcomp -bv green -o %LogsDir%\rcomp_version.txt 2>&amp;1"/>
+    <Execute Component="Get Latest Green Trace Compiler from TCL" Cwd="%BuildDir%" CommandLine="perl %CleanSourceDir%\os\buildtools\bldsystemtools\commonbldutils\GetDPComp\GetDPComp.pl -c osttracecompiler -bv green -o %LogsDir%\tracecompiler_version.txt 2>&amp;1"/>    
     <Execute Component="Copy OS Reltools.ini to epoc32/relinfo" Cwd="%BuildDir%" CommandLine="copy %CleanSourceDir%\os\deviceplatformrelease\symbianosbld\productionbldcbrconfig\%BuildShortName%\reltools.ini %EPOCROOT%epoc32\relinfo\toreltools.ini"/>
-    <Execute Component="Push the latest Rcomp to OS" Cwd="%BuildDir%" CommandLine="perl %CleanSourceDir%\os\buildtools\bldsystemtools\commonbldutils\pushComp.pl -c dev_build_bintools_rcomp -r %EPOCROOT%epoc32\relinfo\toreltools.ini -version DP00572"/>
-    <Execute Component="Push the Latest Green Trace Compiler to OS Archive" Cwd="%BuildDir%" CommandLine="perl %CleanSourceDir%\os\buildtools\bldsystemtools\commonbldutils\pushComp.pl -c osttracecompiler -r %EPOCROOT%epoc32\relinfo\toreltools.ini -version DP00572"/>
+    <Execute Component="Push the latest Rcomp to OS" Cwd="%BuildDir%" CommandLine="perl %CleanSourceDir%\os\buildtools\bldsystemtools\commonbldutils\pushComp.pl -c dev_build_bintools_rcomp -r %EPOCROOT%epoc32\relinfo\toreltools.ini -g"/>
+    <Execute Component="Push the Latest Green Trace Compiler to OS Archive" Cwd="%BuildDir%" CommandLine="perl %CleanSourceDir%\os\buildtools\bldsystemtools\commonbldutils\pushComp.pl -c osttracecompiler -r %EPOCROOT%epoc32\relinfo\toreltools.ini -g"/>
 	 <!-- "DS.1756" changes bootstrapping components from TCL  START -->
- 	 <Execute Component="Get latest dev_build_imgtools_romtools component from TCL" Cwd="%BuildDir%" CommandLine="perl %CleanSourceDir%\os\buildtools\bldsystemtools\commonbldutils\GetDPComp\GetDPComp.pl -s -c dev_build_imgtools_romtools -bv DP00572_DeveloperProduct -o %LogsDir%\dev_build_imgtools_romtools_version.txt 2>&amp;1"/>
-     <Execute Component="Push the latest dev_build_imgtools_romtools to OS" Cwd="%BuildDir%" CommandLine="perl %CleanSourceDir%\os\buildtools\bldsystemtools\commonbldutils\pushComp.pl -c dev_build_imgtools_romtools -r %EPOCROOT%epoc32\relinfo\toreltools.ini -version DP00572"/>
+ 	 <Execute Component="Get latest dev_build_imgtools_romtools component from TCL" Cwd="%BuildDir%" CommandLine="perl %CleanSourceDir%\os\buildtools\bldsystemtools\commonbldutils\GetDPComp\GetDPComp.pl -s -c dev_build_imgtools_romtools -bv green -o %LogsDir%\dev_build_imgtools_romtools_version.txt 2>&amp;1"/>
+     <Execute Component="Push the latest dev_build_imgtools_romtools to OS" Cwd="%BuildDir%" CommandLine="perl %CleanSourceDir%\os\buildtools\bldsystemtools\commonbldutils\pushComp.pl -c dev_build_imgtools_romtools -r %EPOCROOT%epoc32\relinfo\toreltools.ini -g"/>
      
-     <Execute Component="Get latest dev_build_imgtools_buildrom component from TCL" Cwd="%BuildDir%" CommandLine="perl %CleanSourceDir%\os\buildtools\bldsystemtools\commonbldutils\GetDPComp\GetDPComp.pl -s -c dev_build_imgtools_buildrom -bv DP00572_DeveloperProduct -o %LogsDir%\dev_build_imgtools_buildrom_version.txt 2>&amp;1"/>
-     <Execute Component="Push the latest dev_build_imgtools_buildrom to OS" Cwd="%BuildDir%" CommandLine="perl %CleanSourceDir%\os\buildtools\bldsystemtools\commonbldutils\pushComp.pl -c dev_build_imgtools_buildrom -r %EPOCROOT%epoc32\relinfo\toreltools.ini -version DP00572"/>
+     <Execute Component="Get latest dev_build_imgtools_buildrom component from TCL" Cwd="%BuildDir%" CommandLine="perl %CleanSourceDir%\os\buildtools\bldsystemtools\commonbldutils\GetDPComp\GetDPComp.pl -s -c dev_build_imgtools_buildrom -bv green -o %LogsDir%\dev_build_imgtools_buildrom_version.txt 2>&amp;1"/>
+     <Execute Component="Push the latest dev_build_imgtools_buildrom to OS" Cwd="%BuildDir%" CommandLine="perl %CleanSourceDir%\os\buildtools\bldsystemtools\commonbldutils\pushComp.pl -c dev_build_imgtools_buildrom -r %EPOCROOT%epoc32\relinfo\toreltools.ini -g"/>
  
-     <Execute Component="Get latest dev_build_imgtools_imglib component from TCL" Cwd="%BuildDir%" CommandLine="perl %CleanSourceDir%\os\buildtools\bldsystemtools\commonbldutils\GetDPComp\GetDPComp.pl -s -c dev_build_imgtools_imglib -bv DP00572_DeveloperProduct -o %LogsDir%\dev_build_imgtools_imglib_version.txt 2>&amp;1"/>
-     <Execute Component="Push the latest dev_build_imgtools_imglib to OS" Cwd="%BuildDir%" CommandLine="perl %CleanSourceDir%\os\buildtools\bldsystemtools\commonbldutils\pushComp.pl -c dev_build_imgtools_imglib -r %EPOCROOT%epoc32\relinfo\toreltools.ini -version DP00572"/>
+     <Execute Component="Get latest dev_build_imgtools_imglib component from TCL" Cwd="%BuildDir%" CommandLine="perl %CleanSourceDir%\os\buildtools\bldsystemtools\commonbldutils\GetDPComp\GetDPComp.pl -s -c dev_build_imgtools_imglib -bv green -o %LogsDir%\dev_build_imgtools_imglib_version.txt 2>&amp;1"/>
+     <Execute Component="Push the latest dev_build_imgtools_imglib to OS" Cwd="%BuildDir%" CommandLine="perl %CleanSourceDir%\os\buildtools\bldsystemtools\commonbldutils\pushComp.pl -c dev_build_imgtools_imglib -r %EPOCROOT%epoc32\relinfo\toreltools.ini -g"/>
  
-     <Execute Component="Get latest dev_build_imgtools_sisutils component from TCL" Cwd="%BuildDir%" CommandLine="perl %CleanSourceDir%\os\buildtools\bldsystemtools\commonbldutils\GetDPComp\GetDPComp.pl -s -c dev_build_imgtools_sisutils -bv DP00572_DeveloperProduct -o %LogsDir%\dev_build_imgtools_sisutils_version.txt 2>&amp;1"/>
-     <Execute Component="Push the latest dev_build_imgtools_sisutils to OS" Cwd="%BuildDir%" CommandLine="perl %CleanSourceDir%\os\buildtools\bldsystemtools\commonbldutils\pushComp.pl -c dev_build_imgtools_sisutils -r %EPOCROOT%epoc32\relinfo\toreltools.ini -version DP00572"/>
+     <Execute Component="Get latest dev_build_imgtools_sisutils component from TCL" Cwd="%BuildDir%" CommandLine="perl %CleanSourceDir%\os\buildtools\bldsystemtools\commonbldutils\GetDPComp\GetDPComp.pl -s -c dev_build_imgtools_sisutils -bv green -o %LogsDir%\dev_build_imgtools_sisutils_version.txt 2>&amp;1"/>
+     <Execute Component="Push the latest dev_build_imgtools_sisutils to OS" Cwd="%BuildDir%" CommandLine="perl %CleanSourceDir%\os\buildtools\bldsystemtools\commonbldutils\pushComp.pl -c dev_build_imgtools_sisutils -r %EPOCROOT%epoc32\relinfo\toreltools.ini -g"/>
       <!-- "DS.1756" changes bootstrapping components from TCL  END -->
 
  <!-- Retrieve S60 binaries which remoteconn is dependent on -->
@@ -442,7 +442,7 @@
     <!-- GET IMGCHECK component  --> 
     <Execute Component="Imgcheck  Make Dir relinfo" Cwd="%BuildDir%" CommandLine="mkdir %BuildDir%\epoc32\relinfo\"/>
     <Execute Component="Get TCL sfreltools.ini" Cwd="%BuildDir%" CommandLine="copy %CleanSourceDir%\os\buildtools\bldsystemtools\commonbldutils\TCL_Support\sfreltools.ini %BuildDir%\epoc32\relinfo\reltools.ini"/>
-    <Execute Component="Obtain IMGCHECK component" Cwd="%BuildDir%" CommandLine="perl %CleanSourceDir%\os\buildtools\bldsystemtools\commonbldutils\GetDPComp\GetDPComp.pl -c dev_build_imgtools_imgcheck -bv DP00572_DeveloperProduct -o %LogsDir%\imgcheck_version.txt"/>    
+    <Execute Component="Obtain IMGCHECK component" Cwd="%BuildDir%" CommandLine="perl %CleanSourceDir%\os\buildtools\bldsystemtools\commonbldutils\GetDPComp\GetDPComp.pl -c dev_build_imgtools_imgcheck -bv green -o %LogsDir%\imgcheck_version.txt"/>    
     
     <!-- USE IMGCHECK to create SID, VID reports for these ROM images -->
     <Execute Component="Run IMGCHECK" Cwd="%BuildDir%" CommandLine="%BuildDir%\epoc32\tools\imgcheck.exe --e32input --sid --vid  --verbose M:\epoc32\release\armv5\urel\ -x -o=%LogsDir%\SIDVID.xml -a 2>&amp;1"/> 
@@ -460,7 +460,7 @@
     <Execute Component="Make Dir relinfo" Cwd="%BuildDir%" CommandLine="mkdir %BuildDir%\epoc32\relinfo\"/>
     <Execute Component="Get TCL sfreltools.ini" Cwd="%BuildDir%" CommandLine="copy %CleanSourceDir%\os\buildtools\bldsystemtools\commonbldutils\TCL_Support\sfreltools.ini %EPOCROOT%epoc32\relinfo\reltools.ini"/>
           
-    <Execute Component="Obtain CDB tools" Cwd="%BuildDir%" CommandLine="perl %CleanSourceDir%\os\buildtools\bldsystemtools\commonbldutils\GetDPComp\GetDPComp.pl -c ana_compatanamdw_apicompatanamdw_cdb -bv DP00572_DeveloperProduct -o %LogsDir%\cdb_version.txt"/>          
+    <Execute Component="Obtain CDB tools" Cwd="%BuildDir%" CommandLine="perl %CleanSourceDir%\os\buildtools\bldsystemtools\commonbldutils\GetDPComp\GetDPComp.pl -c ana_compatanamdw_apicompatanamdw_cdb -bv green -o %LogsDir%\cdb_version.txt"/>