Binary file Version/data/sw.txt has changed
--- a/layers.sysdef.xml Mon Mar 29 11:30:58 2010 +0100
+++ b/layers.sysdef.xml Mon Mar 29 11:36:31 2010 +0100
@@ -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>
Binary file locfiles/data/01.zip has changed
Binary file locfiles/data/02.zip has changed
Binary file locfiles/data/03.zip has changed
Binary file locfiles/data/04.zip has changed
Binary file locfiles/data/05.zip has changed
Binary file locfiles/data/06.zip has changed
Binary file locfiles/data/07.zip has changed
Binary file locfiles/data/08.zip has changed
Binary file locfiles/data/09.zip has changed
Binary file locfiles/data/10.zip has changed
Binary file locfiles/data/102.zip has changed
Binary file locfiles/data/103.zip has changed
Binary file locfiles/data/129.zip has changed
Binary file locfiles/data/13.zip has changed
Binary file locfiles/data/14.zip has changed
Binary file locfiles/data/14346.zip has changed
Binary file locfiles/data/14387.zip has changed
Binary file locfiles/data/14412.zip has changed
Binary file locfiles/data/14419.zip has changed
Binary file locfiles/data/15.zip has changed
Binary file locfiles/data/157.zip has changed
Binary file locfiles/data/158.zip has changed
Binary file locfiles/data/159.zip has changed
Binary file locfiles/data/16.zip has changed
Binary file locfiles/data/160.zip has changed
Binary file locfiles/data/161.zip has changed
Binary file locfiles/data/17.zip has changed
Binary file locfiles/data/18.zip has changed
Binary file locfiles/data/230.zip has changed
Binary file locfiles/data/25.zip has changed
Binary file locfiles/data/26.zip has changed
Binary file locfiles/data/27.zip has changed
Binary file locfiles/data/28.zip has changed
Binary file locfiles/data/29.zip has changed
Binary file locfiles/data/30.zip has changed
Binary file locfiles/data/31.zip has changed
Binary file locfiles/data/32.zip has changed
Binary file locfiles/data/326.zip has changed
Binary file locfiles/data/327.zip has changed
Binary file locfiles/data/33.zip has changed
Binary file locfiles/data/37.zip has changed
Binary file locfiles/data/39.zip has changed
Binary file locfiles/data/42.zip has changed
Binary file locfiles/data/44.zip has changed
Binary file locfiles/data/45.zip has changed
Binary file locfiles/data/49.zip has changed
Binary file locfiles/data/50.zip has changed
Binary file locfiles/data/51.zip has changed
Binary file locfiles/data/54.zip has changed
Binary file locfiles/data/57.zip has changed
Binary file locfiles/data/58.zip has changed
Binary file locfiles/data/59.zip has changed
Binary file locfiles/data/65.zip has changed
Binary file locfiles/data/67.zip has changed
Binary file locfiles/data/68.zip has changed
Binary file locfiles/data/70.zip has changed
Binary file locfiles/data/76.zip has changed
Binary file locfiles/data/78.zip has changed
Binary file locfiles/data/79.zip has changed
Binary file locfiles/data/83.zip has changed
Binary file locfiles/data/93.zip has changed
Binary file locfiles/data/94.zip has changed
Binary file locfiles/data/96.zip has changed
Binary file locfiles/group/switch_loc.zip has changed
--- a/sf_build/sf_prebuild/makefile Mon Mar 29 11:30:58 2010 +0100
+++ b/sf_build/sf_prebuild/makefile Mon Mar 29 11:36:31 2010 +0100
@@ -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
--- a/symbianosbld/cedarutils/Symbian_OS_vFuture_Schedule12.xml Mon Mar 29 11:30:58 2010 +0100
+++ b/symbianosbld/cedarutils/Symbian_OS_vFuture_Schedule12.xml Mon Mar 29 11:36:31 2010 +0100
@@ -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: 1764305 $ $DateTime: 2010/03/01 17:32:46 $ $Id: //SSS/release/sf/tb92/os/deviceplatformrelease/symbianosbld/cedarutils/Symbian_OS_vFuture_Schedule12.xml#63 $" >
<OR name="Alarm Server">
Maintains a queue of all system-wide alarms and provides APIs to manage alarms
<system_model entry="Alarm Server"/>
--- a/symbianosbld/cedarutils/Symbian_OS_vtb101sf_Schedule12.xml Mon Mar 29 11:30:58 2010 +0100
+++ b/symbianosbld/cedarutils/Symbian_OS_vtb101sf_Schedule12.xml Mon Mar 29 11:36:31 2010 +0100
@@ -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: 1764305 $ $DateTime: 2010/03/01 17:32:46 $ $Id: //SSS/release/sf/tb92/os/deviceplatformrelease/symbianosbld/cedarutils/Symbian_OS_vtb101sf_Schedule12.xml#63 $" >
<OR name="Alarm Server">
Maintains a queue of all system-wide alarms and provides APIs to manage alarms
<system_model entry="Alarm Server"/>
--- a/symbianosbld/cedarutils/Symbian_OS_vtb92sf.xml Mon Mar 29 11:30:58 2010 +0100
+++ b/symbianosbld/cedarutils/Symbian_OS_vtb92sf.xml Mon Mar 29 11:36:31 2010 +0100
@@ -40,9 +40,10 @@
<SetEnv Order="19" Name="MWLD" Value="%MWROOT%\Symbian_Tools\Command_Line_Tools\mwldsym2.exe"/>
<SetEnv Order="20" Name="PATH" Value="%MWROOT%\Symbian_Tools\Command_Line_Tools;%PATH%"/>
<SetEnv Order="21" Name="PATH" Value="%PATH%;C:\Apps\Python24"/>
- <SetEnv Order="22" Name="PATH" Value="%EPOCROOT%SBSv2\bin;%PATH%"/>
+ <!-- %SBS_LOCAL_BIN% is required to support the optional use of a locally installed Raptor -->
+ <SetEnv Order="22" Name="PATH" Value="%SBS_LOCAL_BIN%%EPOCROOT%SBSv2\bin;%PATH%"/>
<SetEnv Order="23" Name="SBS_SRC" Value="%EPOCROOT%tools\sbs"/>
- <SetEnv Order="24" Name="SBS_HOME" Value="%EPOCROOT%SBSv2"/>
+ <SetEnv Order="24" Name="SBS_ROOT" Value="%EPOCROOT%SBSv2"/>
<SetEnv Order="25" Name="SOURCEROOT" Value="%SourceDir%"/>
<SetEnv Order="26" Name="SBS_VERSION" Value="1"/>
<SetEnv Order="27" Name="PATH" Value="%BuildDir%\reltools;%EPOCROOT%epoc32\tools;%EPOCROOT%epoc32\gcc\bin;%PATH%;%EPOCROOT%epoc32\rom\include;%EPOCROOT%epoc32\include;"/>
@@ -64,14 +65,14 @@
<!-- 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 "cbr tools" \reltools\ /E /R /Y"/>
<Execute Component="Remove cbr tools directory" Cwd="%BuildDir%" CommandLine="rd "cbr tools" /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="Copy SBSv2 to own directory" Cwd="%BuildDir%" CommandLine="perl %CleanSourceDir%\os\buildtools\bldsystemtools\commonbldutils\bxcopy.pl -s %SBS_SRC% -t %SBS_HOME%"/>
+ <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_ROOT%"/>
<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 +241,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>&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>&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>&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>&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>&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>&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>&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>&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>&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>&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>&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>&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>&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 -->
@@ -395,7 +396,7 @@
<!--Prep for CBR -->
<Execute Component="CBR Copy Clean Src" Cwd="%BuildDir%\CBRTV" CommandLine="xcopy %CleanSourceDir% %BuildDir%\CBRTV\sf /E /Z /I /Q"/>
- <Execute Component="Run sbsv2cache tool" Cwd="%BuildDir%" CommandLine="%SBS_HOME%\win32\python252\python.exe %SBS_HOME%\bin\sbsv2cache.py -v -s -o %ABLDCACHE% -l %LogsDir%\sbs_e32toolp_log.xml.log -l %LogsDir%\sbs_GT_log.xml.log -l %LogsDir%\sbs_TV_log.xml.log -l %LogsDir%\sbs_tools_log.xml.log -l %LogsDir%\sbs_tools2_rel_log.xml.log -l %LogsDir%\sbs_tools2_deb_log.xml.log > %LogsDir%\sbs_sbsv2cache.log 2>&1"/>
+ <Execute Component="Run sbsv2cache tool" Cwd="%BuildDir%" CommandLine="%SBS_ROOT%\win32\python252\python.exe %SBS_ROOT%\bin\sbsv2cache.py -v -s -o %ABLDCACHE% -l %LogsDir%\sbs_e32toolp_log.xml.log -l %LogsDir%\sbs_GT_log.xml.log -l %LogsDir%\sbs_TV_log.xml.log -l %LogsDir%\sbs_tools_log.xml.log -l %LogsDir%\sbs_tools2_rel_log.xml.log -l %LogsDir%\sbs_tools2_deb_log.xml.log > %LogsDir%\sbs_sbsv2cache.log 2>&1"/>
<Execute Component="Publish Raptor Cache Log" Cwd="%BuildDir%" CommandLine="copy %LogsDir%\sbs_sbsv2cache.log %PublishLocation%\%Type%\%BuildNumber%\logs\sbs_sbsv2cache.log"/>
<!-- Cleanup unnecessary files to remove warnings -->
@@ -442,7 +443,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>&1"/>
@@ -460,7 +461,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"/>