# HG changeset patch
# User Zheng Shen <zheng.shen@nokia.com>
# Date 1284030550 -28800
# Node ID a4eca1f021ac447b718ca7e945166a200e147e91
# Parent  9435b9008a58e723e9c4668296f1922fcb0d0864
ROMTools-13.1.0.2
Bug 3415 -  SBS failing to build open C libraries

diff -r 9435b9008a58 -r a4eca1f021ac imgtools/buildrom/group/release.txt
--- a/imgtools/buildrom/group/release.txt	Mon Aug 30 15:04:06 2010 +0800
+++ b/imgtools/buildrom/group/release.txt	Thu Sep 09 19:09:10 2010 +0800
@@ -1,3 +1,8 @@
+Version 3.28.0 (BUILDROM)
+===============
+Released by Marvin Shi, 7/09/2010
+	1) feature for XIP image only
+
 Version 3.27.1 (BUILDROM)
 ===============
 Released by Lorence Wang, 10/08/2010
diff -r 9435b9008a58 -r a4eca1f021ac imgtools/buildrom/tools/buildrom.pm
--- a/imgtools/buildrom/tools/buildrom.pm	Mon Aug 30 15:04:06 2010 +0800
+++ b/imgtools/buildrom/tools/buildrom.pm	Thu Sep 09 19:09:10 2010 +0800
@@ -66,8 +66,8 @@
 my $enforceFeatureManager = 0; # Flag to make Feature Manager mandatory if SYMBIAN_FEATURE_MANAGER macro is defined. 
 
 my $BuildromMajorVersion = 3 ;
-my $BuildromMinorVersion = 27;
-my $BuildromPatchVersion = 2;
+my $BuildromMinorVersion = 28;
+my $BuildromPatchVersion = 0;
 
 
 sub print_usage
@@ -158,6 +158,7 @@
    -prependepocroot                 -- if there is no EPOCROOT## before /epoc32/, prepend EPOCROOT## to epoc32.
    -stdcpp                          -- ignore symbian customized cpp and try to find another cpp in the PATH.(for Windows only)
    -cpp=xxx                         -- specify a CPP preprocessor used by Buildrom.
+   -xiponly                      -- just create the XIP ROM image without creating the ROFS image.
    
 Popular -D defines to use include
 
@@ -352,6 +353,7 @@
 my $obycharset;
 my $cppoption = 0;
 my $preprocessor = "cpp";
+my $opt_xiponly = 0;
 
 sub match_obyfile
 {
@@ -1232,6 +1234,11 @@
 			$lowMem = $arg;
 			next;
 		}
+		if( $arg =~ /^-xiponly$/i)
+		{
+			$opt_xiponly = 1;
+			next;
+		}
 	    if ($arg =~ /^-/)
 	    {
 		print "Unknown arg: $arg\n";
@@ -3184,7 +3191,12 @@
 	foreach $line (@obydata)
 	{
 		track_source($line);
-		if ($line =~ /^\s*REM/i || $line =~ /^\s*TIME\s*=\s*/i)
+		if (($opt_xiponly == 1) && ($line =~ /^\s*REM\s*ROM_IMAGE\[\s*[^0]\s*\]/i))
+		{
+			print "Skip all the content for ROFS image\n" if($opt_v);
+			last;
+		}
+		elsif ($line =~ /^\s*REM/i || $line =~ /^\s*TIME\s*=\s*/i)
 		{
 			# ignore REM statements, to avoid processing "REM data=xxx yyy"
 		}
@@ -4402,7 +4414,7 @@
 				$rombuild .= " -symbols" unless($nosymbols) ;
 				run_rombuilder($rombuild.$compress, $obeyfile, $thisdir."ROMBUILD.LOG");
 			}
-			else
+			elsif($opt_xiponly == 0)
 			{
 				# efficient_rom_paging.pm can move everything to core rom.
 				# If that is the case, don't run rofsbuild at all to avoid errors.
diff -r 9435b9008a58 -r a4eca1f021ac imgtools/imgcheck/group/release.txt
--- a/imgtools/imgcheck/group/release.txt	Mon Aug 30 15:04:06 2010 +0800
+++ b/imgtools/imgcheck/group/release.txt	Thu Sep 09 19:09:10 2010 +0800
@@ -1,3 +1,8 @@
+version v1.4.1
+===============
+Released by Lorence Wang, 30/08/2010
+	1) ou1cimx1#546004 imgcheck crash when check s60 rofs1 image
+
 version v1.4.0
 ===============
 Released by Zheng Shen, 22/02/2010
diff -r 9435b9008a58 -r a4eca1f021ac imgtools/imgcheck/inc/version.h
--- a/imgtools/imgcheck/inc/version.h	Mon Aug 30 15:04:06 2010 +0800
+++ b/imgtools/imgcheck/inc/version.h	Thu Sep 09 19:09:10 2010 +0800
@@ -33,7 +33,7 @@
 */
 const string gMajorVersion("V1");
 const string gMinorVersion(".4");
-const string gMaintenanceVersion(".0 \n");
+const string gMaintenanceVersion(".1 \n");
 
 /** 
 Copyright to be displayed
diff -r 9435b9008a58 -r a4eca1f021ac imgtools/imgcheck/libimgutils/src/rofsreader.cpp
--- a/imgtools/imgcheck/libimgutils/src/rofsreader.cpp	Mon Aug 30 15:04:06 2010 +0800
+++ b/imgtools/imgcheck/libimgutils/src/rofsreader.cpp	Thu Sep 09 19:09:10 2010 +0800
@@ -118,7 +118,7 @@
 				ext.find(".prt") != string::npos || ext.find(".nif") != string::npos || 
 				ext.find(".tsy") != string::npos || ext.find(".pdl") != string::npos || 
 				ext.find(".csy") != string::npos || ext.find(".agt") != string::npos || 
-				ext.find(".ani") != string::npos || ext.find(".loc") != string::npos || 
+				ext.find(".ani") != string::npos || //ext.find(".loc") != string::npos || 
 				ext.find(".pdd") != string::npos || ext.find(".ldd") != string::npos ||
 				ext.find(".drv") != string::npos)  {
 				return true;
diff -r 9435b9008a58 -r a4eca1f021ac sbsv1/abld/group/release.txt
--- a/sbsv1/abld/group/release.txt	Mon Aug 30 15:04:06 2010 +0800
+++ b/sbsv1/abld/group/release.txt	Thu Sep 09 19:09:10 2010 +0800
@@ -1,3 +1,8 @@
+===============
+(Made by Ross Qin 06/09/2010)
+Change for Symbian Foundation bug 3415
+sym_lkup_util 	version 1.1.1
+
 Version 0.01.680
 =========================
 (Made by Marvin Shi 19/08/2010)
diff -r 9435b9008a58 -r a4eca1f021ac sbsv1/abld/platform/sym_lkup_util.pl
--- a/sbsv1/abld/platform/sym_lkup_util.pl	Mon Aug 30 15:04:06 2010 +0800
+++ b/sbsv1/abld/platform/sym_lkup_util.pl	Thu Sep 09 19:09:10 2010 +0800
@@ -44,11 +44,11 @@
 # Version
 my $MajorVersion = 1;
 my $MinorVersion = 1;
-my $PatchVersion = 0;
+my $PatchVersion = 1;
 
 
 {
-	unless (GetOptions(\%Options, 'sym=s', 'o=s', 'map=s', 'ignore_export_dir')) {
+	unless (GetOptions(\%Options, 'sym=s', 'o=s', 'map=s', 'ignore_export_dir','h')) {
 		exit 1;
 	}
 	$ImportSymFile = $Options{sym};
@@ -56,16 +56,17 @@
 	$mapFile = $Options{map};
 	$IgnoreExportDir = $Options{ignore_export_dir};
 
-	unless($ImportSymFile)
-	{
+	my $help = $Options{h};
+	if($help) {
 		print(
 			 "\n",
 			 "SYM_LKUP_UTIL symbol process tool V$MajorVersion.$MinorVersion.$PatchVersion\n",
 			 "\n",
 			 "options:\n",
-			 " -sym symbol file\n",
-			 " -o   output file\n",
-			 " -map  map file\n",
+			 " -sym\tsymbol file\n",
+			 " -o\toutput file\n",
+			 " -map\tmap file\n",
+			 " -h\tprint this message\n",
 			 "\n"
 		);
 		exit 1;