Mercurial Mercurial > oss > FCL > sf > incubator > stemkit / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Further tweaks to buildrom.pm, and updated originals after re-running imaker
authorWilliam Roberts <williamr@symbian.org>
Sat, 09 Oct 2010 15:54:10 +0100
changeset 7 58366ddcbc93
parent 6 d48e90a0206b
child 8 36cb9eb36988
Further tweaks to buildrom.pm, and updated originals after re-running imaker
original/syborg.rom.log file | annotate | diff | comparison | revisions
original/syborg.rom.oby file | annotate | diff | comparison | revisions
original/syborg.tmp1.oby file | annotate | diff | comparison | revisions
original/syborg_core_master.oby file | annotate | diff | comparison | revisions
original/syborg_flash.log file | annotate | diff | comparison | revisions
syborg_stem/buildrom.pm file | annotate | diff | comparison | revisions 
Binary file original/syborg.rom.log has changed
--- a/original/syborg.rom.oby	Sat Oct 09 15:17:17 2010 +0100
+++ b/original/syborg.rom.oby	Sat Oct 09 15:54:10 2010 +0100
@@ -9,13 +9,15 @@
 REM define which port IrDA uses
 REM define which serial port Bluetooth protocol uses
 REM Define whether or not to include USB client support:
-REM redefined ROMDATE as 08\10\2010
+REM processed ROMBUILD_OPTION -no-header 
+REM redefined ROMDATE as 09\10\2010
 unicode
 romsize=0x5000000
-time=08/10/2010 12:00:00
+time=09/10/2010 12:00:00
 REM defaultfeaturedb = epoc32\rom\include\featuredatabase.xml 
 REM ROM version number
 version=0.01(0)
+REM processed 	enable_spi
 PlatSecDiagnostics OFF
 PlatSecEnforcement ON
 PlatSecEnforceSysBin ON
@@ -7906,7 +7908,7 @@
 data=\epoc32\data\Z\resource\apps\anomaly.RSC 	"resource\apps\anomaly.rsc" 
 data=\epoc32\data\Z\private\10003a3f\import\Apps\anomaly_reg.rsc 	"private\10003a3f\import\apps\anomaly_reg.rsc"
 romname syborg.rom.img
-time=08/10/2010
+time=09/10/2010
 romchecksum=0x12345678
 data=\epoc32\rombuild\syborg\core\features.dat 	"private\10205054\features.dat"
 data=\epoc32\rombuild\syborg\core\ecom-0-0.spi 	"private\10009d8f\ecom-0-0.spi"
--- a/original/syborg.tmp1.oby	Sat Oct 09 15:17:17 2010 +0100
+++ b/original/syborg.tmp1.oby	Sat Oct 09 15:54:10 2010 +0100
@@ -11219,7 +11219,7 @@
 
 
 define  ROMMEGS F8
-define  ROMDATE 08/10/2010
+define  ROMDATE 09/10/2010
 # 1 "..\\..\\..\\include\\data_caging_paths_for_iby.hrh" 1
  
 
@@ -99178,6 +99178,6 @@
 # 35 "/epoc32/rombuild/syborg/core/syborg_core_master.oby" 2
 
 romname syborg.rom.img
-time=08/10/2010
+time=09/10/2010
 romchecksum=0x12345678
 }
--- a/original/syborg_core_master.oby	Sat Oct 09 15:17:17 2010 +0100
+++ b/original/syborg_core_master.oby	Sat Oct 09 15:54:10 2010 +0100
@@ -25,7 +25,7 @@
 #undef  SECTION
 #define SECTION
 define  ROMMEGS F8
-define  ROMDATE 08/10/2010
+define  ROMDATE 09/10/2010
 #include <data_caging_paths_for_iby.hrh>
 
 // Core ROM
@@ -34,6 +34,6 @@
 #include "../../../rom/config/sf_refhw/bigrom.oby"
 #include "syborg_core_collected.oby"
 romname syborg.rom.img
-time=08/10/2010
+time=09/10/2010
 romchecksum=0x12345678
 }
--- a/original/syborg_flash.log	Sat Oct 09 15:17:17 2010 +0100
+++ b/original/syborg_flash.log	Sat Oct 09 15:54:10 2010 +0100
@@ -1,17 +1,17 @@
 ===============================================================================
-TIME: Fri Oct  8 17:10:28 2010, USER: williamr, HOST: UK-1086
+TIME: Sat Oct  9 15:46:55 2010, USER: williamr, HOST: UK-1086
 C:\Perl\bin\perl.exe (v5.12.1-MSWin32)
 WriteFile: `>/epoc32/rombuild/syborg/log/syborg_flash.log'
 ChangeDir: `/epoc32/rombuild/syborg'
 ReadFile: `/epoc32/rombuild/syborg/syborg_flash.icmd'
 # IMAKER_VERSION   = `iMaker 09.06.01, 05-Feb-2009.'
-# IMAKER_CMDARG    = `--file=/epoc32/rom/config/sf_refhw/syborg/image_conf_syborg.mk flash'
-# IMAKER_MAKECMD   = `\epoc32\tools\rom\imaker\mingw_make.exe -R --no-print-directory SHELL="C:\Windows\system32\cmd.exe" -I M:/epoc32/rom/config -f M:/epoc32/tools/rom/imaker/imaker.mk TIMESTAMP=2010100817102841  --file=/epoc32/rom/config/sf_refhw/syborg/image_conf_syborg.mk  -f M:/epoc32/tools/rom/imaker/imaker.mk flash'
+# IMAKER_CMDARG    = `--file=/epoc32/rom/config/sf_refhw/syborg/image_conf_syborg.mk  flash'
+# IMAKER_MAKECMD   = `\epoc32\tools\rom\imaker\mingw_make.exe -R --no-print-directory SHELL="C:\Windows\system32\cmd.exe" -I M:/epoc32/rom/config -f M:/epoc32/tools/rom/imaker/imaker.mk TIMESTAMP=2010100915465441  --file=/epoc32/rom/config/sf_refhw/syborg/image_conf_syborg.mk  -f M:/epoc32/tools/rom/imaker/imaker.mk flash'
 # IMAKER_PERLCMD   = `perl -x M:/epoc32/tools/rom/imaker/imaker.pl --cmdfile "/epoc32/rombuild/syborg/syborg_flash.icmd" --logfile "/epoc32/rombuild/syborg/log/syborg_flash.log"  --step "IMAKERPRE:cbk-COREPRE:cb-CORE:cb-COREPOST:cb" --verbose "1" --workdir "/epoc32/rombuild/syborg"'
 # IMAKER_EXITSHELL = `'
 # SHELL            = `C:/Windows/system32/cmd.exe'
 # MAKE             = `M:/epoc32/tools/rom/imaker/mingw_make'
-# MAKEFLAGS        = ` --no-print-directory -RrI M:/epoc32/rom/config -- TIMESTAMP=2010100817102841 SHELL=C:/Windows/system32/cmd.exe'
+# MAKEFLAGS        = ` --no-print-directory -RrI M:/epoc32/rom/config -- TIMESTAMP=2010100915465441 SHELL=C:/Windows/system32/cmd.exe'
 # MAKECMDGOALS     = `flash'
 # $@               = `flash'
 # MAKELEVEL        = `0'
@@ -376,13 +376,13 @@
 
  Directory of M:\epoc32\rombuild\syborg\core
 
-08/10/2010  17:10           860,139 syborg.dir
-08/10/2010  17:11         5,708,139 syborg.log
-08/10/2010  17:10           722,932 syborg.oby
-08/10/2010  17:11       124,739,584 syborg.rom.img
-               4 File(s)    132,030,794 bytes
-               0 Dir(s)   9,579,982,848 bytes free
-==========>8==========>8==========>8==========>8==========>8===00:38===[END]<<<
+09/10/2010  15:47           860,139 syborg.dir
+09/10/2010  15:47         5,708,171 syborg.log
+09/10/2010  15:47           723,002 syborg.oby
+09/10/2010  15:47       124,739,584 syborg.rom.img
+               4 File(s)    132,030,896 bytes
+               0 Dir(s)   9,649,045,504 bytes free
+==========>8==========>8==========>8==========>8==========>8===01:00===[END]<<<
 
 Missing file(s):
  1) ..\..\..\..\epoc32\rom\include\csc_plugin.iby(3): Missing file: '\epoc32\release\ARMV5\urel\10286506.dll' in statement 'file='
@@ -502,7 +502,7 @@
 MoveFile: `/epoc32/rombuild/syborg/core/syborg.log' => `/epoc32/rombuild/syborg/core/syborg.rom.log'
 MoveFile: `/epoc32/rombuild/syborg/core/syborg.oby' => `/epoc32/rombuild/syborg/core/syborg.rom.oby'
 TestFile: `/epoc32/rombuild/syborg/core/syborg.rom.img'
-EXIT: `S:CORE,C:1,B:1,K:0,V:1', duration: 00:40
+EXIT: `S:CORE,C:1,B:1,K:0,V:1', duration: 01:00
 ChangeDir: `/epoc32/rombuild/syborg'
 ===============================================================================
 ENTER: `S:COREPOST,C:1,B:1,K:0,V:1'
@@ -512,7 +512,7 @@
 ============ ===================== 
 1. IMAKERPRE 00:00                 
 2. COREPRE   00:02                 
-3. CORE      00:40 (00:38 + 00:02) 
+3. CORE      01:00 (01:00 + 00:00) 
 4. COREPOST  00:00                 
 ------------ --------------------- 
-Total        00:42                 
+Total        01:02                 
--- a/syborg_stem/buildrom.pm	Sat Oct 09 15:17:17 2010 +0100
+++ b/syborg_stem/buildrom.pm	Sat Oct 09 15:54:10 2010 +0100
@@ -1571,7 +1571,7 @@
 		if ($line=~/^\s*ROMBUILD_OPTION\s+(\S+)\s*/i)
 		{
 			$rombuildOptions{$1} = 1;
-			push @obydata, "REM handled $line";
+			push @obydata, "REM processed $line";
 			next;
 		}
 		
@@ -1580,7 +1580,7 @@
 			if(!($spiset)) {
 				$createspi=1;
 			}
-			push @obydata, "REM handled $line";
+			push @obydata, "REM processed $line";
 			next;
 		}
FCL/sf/incubator/stemkit