FCL/sftools/dev/build: comparison imgtools/buildrom/tools/buildrom.pm

equal deleted inserted replaced

-:7c4a911dc066
+:541af5ee3ed9
 #
-# Copyright (c) 2006-2009 Nokia Corporation and/or its subsidiary(-ies).
+# Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies).
 # All rights reserved.
 # This component and the accompanying materials are made available
 # under the terms of the License "Eclipse Public License v1.0"
 # which accompanies this distribution, and is available
 # at the URL "http://www.eclipse.org/legal/epl-v10.html".
 	getObyCommand
 	process_dlldata
 	featurefile_creation_phase
 	processData
 	create_smrimage
+	getWorkdir
 );
+my $useinterpretsis = 1;
+if ($^O !~ /^MSWin32$/i){
+	$useinterpretsis = 0;
+}
 my $enforceFeatureManager = 0; # Flag to make Feature Manager mandatory if SYMBIAN_FEATURE_MANAGER macro is defined.
 my $BuildromMajorVersion = 3 ;
-my $BuildromMinorVersion = 17;
+my $BuildromMinorVersion = 27;
-my $BuildromPatchVersion = 0;
+my $BuildromPatchVersion = 2;
 sub print_usage
 {
 	# Option "-fm" will be supported instead of option "-f|fr" if SYMBIAN_FEATURE_MANAGER macro is defined.
 and subsequently adjusted by statements in the ROM specification language.
 The final specification is in the subset of the specification language
 which is understood directly by ROMBUILD.
 Each obyfile parameter specifies a file via a search path: if the
-filename is not matched then buildrom will look in \\epoc32\\rom\\include.
+filename is not matched then buildrom will look in \/epoc32\/rom\/include.
 Buildrom invokes ROMBUILD to generate the ROM image, and produces a
 number of related files such as the ROM symbol file. The name of the
 image file is specified directly by the -o option, or determined by
 scanning the final specification for the "romname" keyword. If there is
 -ccomprmethod                    -- compression method: none|inflate|bytepair
 -geninc                          -- generate INC file
 -gendep                          -- generate dependence graph for rom image
 -nosymbols                       -- disable creation of symbol file
 -noimage                         -- disable creation of ROM/ROFS/DataDrive Image
--fastcompress                    -- compress files with faster bytepair and tradeoff of compress ratio
 -j<digit>                        -- do the main job with <digit> threads
+-cache                           -- allow the ROFSBUILD to reuse/generate cached executable files
+-nocache                         -- force the ROFSBUILD not to reuse/generate cached executable files
+-cleancache                      -- permanently remove all cached executable files
+-oby-charset=<charset>	        -- used character set in which OBY was written
 -loglevel<level>                 -- Level of information logging where loglevel is 0,1,2
 0 default level of information
 1 host/ROM filenames, file size and the hidden attribute along with level0 log
 2 E32 file header attributes along with level1 log
 -z=xxx or -zdrivepath=xxx        -- specify a location to create Z drive directory.
 -d=xxx or -datadrivepath=xxx     -- specify a location to create data drive directory.
 -k or -keepgoing                 -- enable keepgoing,continue to create the data drive image even
-if the non-sis, sis or zdrive image file(s) are missing or corrupt.
+if the non-sis, sis or zdrive image file(s) are missing or corrupt; create rom/rofs
+									image even some oby files missing and/or duplicated definitions in oby files .
 -r or -retainfolder              -- enable retainfolder,would retain pre-existence of z & data drive folder.
 -zdriveimage=xxx                 -- specify Z drive image (ROM, CORE, ROFS or Ext-ROFS image).
 -pfile=xxx                       -- specify a parameter file for interpretsis to take additional parameters.
 -argforinterpretsis=xxx          -- specify command line argument(s) for interpretsis which will override the
 parameter file contents.
 -l=xxx or -logimagecontents=xxx  -- extract all stub-sis and SWI certificate store file(s) only
 and log all the file(s) that are part of the Z drive image on to a log file.
 -I<directory>                    -- Use <directory> for the referenced IBY/OBY files
 -argfile=xxx                     -- specify argument-file name containing list of command-line arguments to buildrom
 -lowmem                          -- use memory-mapped file for image build to reduce physical memory consumption
+-checkcase                       -- check character case of path/name in oby/iby files,
+the result will be checkcase.log, this option is only valid on windows.
+-workdir=xxx                     -- specify a directory to contain generated files.
+-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.
 Popular -D defines to use include
 -D_DEBUG         -- select debug versions of some files
 -D_FULL_DEBUG    -- select debug versions of all files
 -D_ARM4          -- specify the target platform
--D_EABI=xxxx     -- specify target for all files (e.g. ARMV5)
+-D_EABI=xxxx     -- specify target for all files (e.g. armv5)
--D_KABI=xxxx     -- specify the target platform for the Kernel (e.g. ARMV5)
+-D_KABI=xxxx     -- specify the target platform for the Kernel (e.g. armv5)
 Other defines may be useful for particular OBY files.
 USAGE_EOF
 }
 use strict;
-my $PerlLibPath;    # fully qualified pathname of the directory containing our Perl modules
+use romutl;
-# establish the path to the Perl libraries
+use romosvariant;
-$PerlLibPath = $FindBin::Bin;	# X:/epoc32/tools
-$PerlLibPath =~ s/\//\\/g;	# X:\epoc32\tools
+my $PerlEPOCPath = &get_epocroot()."epoc32\/tools\/";   # fully qualified pathname of the directory containing EPOC Perl modules
-$PerlLibPath .= "\\";
 sub ExportDirs ($);
-use BPABIutl; # for BPABIutl::BPABIutl_Plat_List
 my $xmlrequired = 0; # assume xml required is false. Used to determine if xml
 # modules should be loaded.
-use Modload;	     # To load modules dynamically
+use flexmodload;	     # To load modules dynamically
 # Work out the relative path to the epoc32 directory
 use spitool qw(&createSpi);
 use Cwd;
-use Pathutl;
-use E32Variant;
-use E32Plat;
-use Genutl;
-use BPABIutl;		# for BPABIutl::BPABIutl_Plat_List
 use externaltools; 	#To invoke External Tools
+use File::Basename;
 my @tempfiles;
 my $preserve = 0; 	#flag to indicate if temporary files should be preserved
 my $uppath="x";	    	# will be initialised when first needed
-my $epocroot = $ENV{EPOCROOT};
+my $epocroot = &get_epocroot;
-die "ERROR: Must set the EPOCROOT environment variable\n" if (!defined($epocroot));
-$epocroot =~ s-/-\\-go;	# for those working with UNIX shells
-die "ERROR: EPOCROOT must not include a drive letter\n" if ($epocroot =~ /^.:/);
-die "ERROR: EPOCROOT must be an absolute path without a drive letter\n" if ($epocroot !~ /^\\/);
-die "ERROR: EPOCROOT must not be a UNC path\n" if ($epocroot =~ /^\\\\/);
-die "ERROR: EPOCROOT must end with a backslash\n" if ($epocroot !~ /\\$/);
-die "ERROR: EPOCROOT must specify an existing directory\n" if (!-d $epocroot);
-my $epoc32 = relative_path("${epocroot}epoc32");
-$epoc32 =~ s-\\-/-go;
 my @obyfiles;
 my $cppargs = "-nostdinc -undef";
 my $opt_v = 0;
 my $opt_o = "";
 use constant ALLSECTIONS    => 1;        # Indicates both paged section and unpaged section will be compressed.
 use constant PAGEDSECTION   => 2;        # Indicates only paged section will be compressed.
 use constant UNPAGEDSECTION => 3;        # Indicates only unpaged section will be compressed.
 my $opt_compression_type = UNCOMPRESSED; # Leave the ROM image uncompressed by default.
+#Variables to store cache command line options
+my $opt_cache      = 0;
+my $opt_nocache    = 0;
+my $opt_cleancache = 0;
 my $thisdir=cwd;
-$thisdir=~s-/-\\-go;		    # separator from Perl 5.005_02+ is forward slash
+$thisdir=~s-\\-\/-go;		    # separator from Perl 5.005_02+ is forward slash
-$thisdir=~s-^(.*[^\\])$-$1\\-o;	    # ensure path ends with a backslash
+$thisdir.= "\/" unless $thisdir =~ /\/$/;
-$thisdir=~s-^.:\\--o;		    # remove drive letter and leading backslash
+$thisdir =~ s-\/-\\-g if (&is_windows);
-my $rominclude = "$epoc32/rom/include";
+my $rominclude = $epocroot."epoc32\/rom\/include\/";
+$rominclude = &get_epocdrive().$rominclude unless $rominclude =~ /^.:/;
+$rominclude =~s-\\-\/-g;
 my %plugintypes; #hash of plugin types and their SPI files' destinations in ROM
-$plugintypes{"ECOM"} = "\\private\\10009d8f\\"; #ECOM SPI files' destination in ROM image
+$plugintypes{"ECOM"} = "\/private\/10009d8f\/"; #ECOM SPI files' destination in ROM image
 my @obydata;
 my @newobydata;
 my %substitutionData;
 my @substitutionOrder;
 my %languageCodes;
 my $defaultLanguageCode;
 my %multiLinguifyAlias;  # to by-pass the 'mustbesysbin' option for multilinguify 'alias'es.
-my $abiDowngrade;
+my $abiDowngrade = "";
 my @binarySelectionOrder;
 my $fromDIR;
 my %rombuildOptions = ("-type-safe-link" => 1 );
 my $enforceSysBin = 0;
 my @romimage;
 my $rombasename;
 my $sourcefile;
 my $sourceline;
-my ($line);
+#my $line;
 my %romfiles;
 # To handle BINARY_SELECTION_ORDER macro.
 my $firstDIR;
 my $binarySelectionOrderFlag = 0;
 my $geninc = "";
 my $gendep = "";
 my $nosymbols = "";
 my $noimage = "";
 my $customizedPlat = undef;
-my $opt_fastcompress = "";
 my $opt_jobs= "";
 #Summary of files(both executables and data files) currently includes
 #	host and ROM file names,
 #	size of the file in ROM
 # This option is used to pass -lowmem argument to rombuild/rofsbuild tools
 my $lowMem="";
 # Feature Variation modules and data
-use featurevariantparser;
-use featurevariantmap;
 my %featureVariant;
 # global variables specific to data drive image generation.
 use File::Path;					# Module to provide functions to remove or create directories in a convenient way.
 use File::Copy;					# Module to provide functions to copy file(s) from source to destination.
 my %smrPartitions;
 my %smrNameInfo;
 my @obeyFileList;
 my $smrNoImageName = 0;
 my $onlysmrimage = 1;
+my $checkcase = 0;
+my $checkcase_platform = "";
+my $checkcase_test = 0;
+my $opt_workdir = 0;
+my $prependepocroot = 0;
+my $stdcpp = 0;
+my $obycharset;
+my $cppoption = 0;
+my $preprocessor = "cpp";
 sub match_obyfile
 {
 	my ($obyfile) = @_;
 	if (-f $obyfile)
 		@otherDirs = @$dirRef if ($dirRef);
 	}
 	foreach my $dir (@otherDirs)
 	{
+		print "$dir/$obyfile\n" if ($opt_v);
 		if (-f "$dir/$obyfile")
 		{
 		    push @obyfiles, "$dir/$obyfile";
 		    return 1;
 		}
 		if($retVal)
 		{
 			&datadriveimage::reportError("* Warning could not delete $ZDirloc",$opt_k);
 		}
 		# delete data drive directory if and only if preserve(-p) option is disabled.
-		my $retVal = &deleteDirectory($DataDriveDirloc,$opt_v)if(!($preserve));
+		$retVal = &deleteDirectory($DataDriveDirloc,$opt_v)if(!($preserve));
 		if($retVal)
 		{
 			&datadriveimage::reportError("* Warning could not delete $DataDriveDirloc",$opt_k);
 		}
 		# reset image count to zero.
 	if (!$preserve)
 	{
 	    foreach my $tempfiles (@tempfiles)
 	    {
+	    print "remove $tempfiles\n" if ($opt_v);
 			unlink "$tempfiles";
 	    }
 	}
 	if($rombasename)
 	{
 {
 	if($dataImageCount)
 	{
 		# set the default path for Z drive and Data drive directory,
 		# if and only if, path is not specified by the user.
-		$ZDirloc = &datadriveimage::setPath("zdrive") unless ($ZDirloc);
+		$ZDirloc = $thisdir."zdrive" unless ($ZDirloc);
-		$DataDriveDirloc = &datadriveimage::setPath("datadrive") unless ($DataDriveDirloc);
+		$DataDriveDirloc = $thisdir."datadrive" unless ($DataDriveDirloc);
 		#delete any existing Z drive directory.
 		my $retVal = &datadriveimage::deleteDirectory($ZDirloc,$opt_v)if(!$opt_r);
 		if($retVal)
 		{
 			exit(1) if(!$opt_k);
 		}
 		# delete pre-existence of data drive folder, if and only if -r option is not enabled.
-		my $retVal = &datadriveimage::deleteDirectory($DataDriveDirloc,$opt_v) if(!$opt_r);
+		$retVal = &datadriveimage::deleteDirectory($DataDriveDirloc,$opt_v) if(!$opt_r);
 		if($retVal)
 		{
 			exit(1) if(!$opt_k);
 		}
 		if($opt_logFile)
 		{
 			# clean any pre-existance of log file.
-			unlink($ZDirloc."\\".$imageEntryLogFile);
+			unlink($ZDirloc."\/".$imageEntryLogFile);
 		}
 		for (my $datadriveidx=0; $datadriveidx < $dataImageCount; $datadriveidx++)
 		{
 			my $driveIndex = $dataIndexHash{$datadriveidx};
 					# final location of prototype data drive.
 					my $proDataDriveDirloc;
 					# Location of stub-sis file(s) inside Z Drive folder.
 					my $zDriveSisFileLoc;
 					# check if more than one data drive image needs to be generated.
+					if ($datadrivename =~ /.*[\\\/]([^\\\/]+)$/)
+					{
+						$datadrivename = $1;
+					}
 					if( $dataImageCount > 1 )
 					{
 						# if yes, then set the location of prototype data drive folder as
 						# DataDriveDirloc + datadrivename
-						$proDataDriveDirloc = $DataDriveDirloc."\\".$datadrivename;
+						$proDataDriveDirloc = $DataDriveDirloc."\/".$datadrivename;
 					}
 					else
 					{
 						# else, then set the location of prototype data drive folder as DataDriveDirloc
 						$proDataDriveDirloc = $DataDriveDirloc;
 						{
 							# find out size of the array
 							my $arraysize = scalar(@zDriveImageList);
 							for( my $i=0; $i < $arraysize; $i++ )
 							{
-								$zDriveSisFileLoc =  $ZDirloc."\\".$datadrivename;
+								$zDriveSisFileLoc =  $ZDirloc."\/".$datadrivename;
 								&datadriveimage::invokeReadImage(pop(@zDriveImageList),$zDriveSisFileLoc,$opt_v,$imageEntryLogFile,$opt_k);
 							}
 						}
 						else
 						{
 									}
 								}
 							}
 						}
 						# invoke INTERPRETSIS tool with z drive folder location.
-						&datadriveimage::invokeInterpretsis( \@sisfilelist,$proDataDriveDirloc,$opt_v,$zDriveSisFileLoc,$paraFile,$opt_k,\@interpretsisOptList)if($sisfilepresent);
+						if ($useinterpretsis)
+						{
+							&datadriveimage::invokeInterpretsis( \@sisfilelist,$proDataDriveDirloc,$opt_v,$zDriveSisFileLoc,$paraFile,$opt_k,\@interpretsisOptList,$thisdir)if($sisfilepresent);
+						}else
+						{
+							print "Warning: interpretsis is not ready on linux.\n";
+						}
 					}
 					# create an oby file by traversing through upated prototype data drive directory.
 					&datadriveimage::dumpDatadriveObydata( $proDataDriveDirloc,$datadriveobyfile,$size,\@nonsisFilelist,
 										\@renameList,\@aliaslist,\@hideList,\@sisobydata,\@datadrivedata,$opt_k,$opt_v );
 	}
 	if (!defined $paramFileFlag)
 	{
 		# Enforce Feature Manager if macro SYMBIAN_FEATURE_MANAGER is defined in the HRH file.
-		my @hrhMacros = &Variant_GetMacroList;
+		my @hrhMacros = &get_variantmacrolist;
 		if (grep /^SYMBIAN_FEATURE_MANAGER\s*$/, @hrhMacros)
 		{
 			$enforceFeatureManager = 1;
 		}
 			{
 				&parameterFileProcessor($1);
 			}
 		}
 	}
+	# first searching argList for keepgoing option
+	foreach my $arg (@argList) {
+		if ( $arg =~ /^-k$/i || $arg =~ /^-keepgoing$/i )
+	  {
+			$opt_k = 1;
+		next;
+		}
+		if ($arg =~ /^-workdir=(.*)/)
+		{
+			my $workdir = $1;
+			if (!-d $workdir)
+			{
+				die "directory $workdir does not exist\n";
+			}
+			my $currentdir = cwd;
+			chdir "$workdir" or die "cannot change to directory $workdir\n";
+			$thisdir=cwd;
+			$thisdir=~s-\\-\/-go;		    # separator from Perl 5.005_02+ is forward slash
+			$thisdir.= "\/" unless $thisdir =~ /\/$/;
+			if(&is_windows)
+			{
+				$thisdir =~ s-\/-\\-g;
+			}
+			$opt_workdir = 1;
+			chdir "$currentdir";
+			next;
+		}
+	}
 	foreach my $arg (@argList)
 	{
 	    if ($arg =~ /^-argfile=(.*)/)
 		{
 			&parameterFileProcessor($1) if (defined $paramFileFlag);
 			my $varname = $1;
 			if ($varname =~ /^\.(.*)$/)
 			{
 				# for testing, locate the VAR file in the current directory
-				%featureVariant = featurevariantparser->GetVariant($1, ".");
+				%featureVariant = get_variant($1, ".");
 			}
 			else
 			{
-				%featureVariant = featurevariantparser->GetVariant($varname);
+				%featureVariant = get_variant($varname);
 			}
 			if (!$featureVariant{'VALID'})
 			{
 			    print "FEATUREVARIANT $varname is not VALID\n";
 				$errors++;
 			}
 			addDrivesToFeatureVariantPaths();
 		}
 		next;
 	    }
-	    if ($arg =~ /^-o(.*)/i)
+	    if ($arg =~/^-oby-charset=(.*)$/i)
+	    {
+		$obycharset = $1;
+		next;
+	    }
+	    if (($arg =~ /^-o(.*)/i) && ($arg !~ /^-oby-charset/i))
 	    {
 		$opt_o = $1;
 		next;
-	    }
-	    if ($arg =~ /^-fastcompress$/i)
-	    {
-		    $opt_fastcompress = "-fastcompress";
-		    next;
 	    }
 	    if ($arg =~ /^-j(\d+)$/i)
 	    {
 		    $opt_jobs = "-j".$1;
 		    next;
 			{
 				print "Error: No filename specified with \"-fm=\" option.\n";
 			}
 			next;
 	    }
+		#Process Cache command line options.
+		if($arg =~ /^-cache/)
+		{
+			$opt_cache = 1;
+			next;
+		}
+		if($arg =~ /^-nocache/)
+		{
+			$opt_nocache = 1;
+			next;
+		}
+		if($arg =~ /^-cleancache/)
+		{
+			$opt_cleancache = 1;
+			next;
+		}
 	    #Process ROM image compression type if it's specified through command line option.
 	    if($arg =~ /^-compress(.*)/)
 	    {
 	    	if($1 eq '')
 	    	{
 		if($arg =~ /^-gendep$/)
 		{
 			$gendep=1;
 			next;
 		}
-if($arg =~/^-c(.*)/)
+		if ($arg =~ /^-checkcase$/)
+		{
+			$checkcase=1;
+			next;
+		}
+		if ($arg =~ /^-checkcase_test$/)
+		{
+			$checkcase_test=1;
+			next;
+		}
+		if ($arg =~ /^-workdir=(.*)/)
+		{
+			next;
+		}
+		if ($arg =~ /^-stdcpp$/)
+		{
+			if (&is_linux)
+			{
+				print "Warning: option -stdcpp only apply for Windows\n";
+				next;
+			}
+			if ($cppoption)
+			{
+				die "Error: -stdcpp option and -cpp=xxx option cannot be used at the same time.\n";
+			}
+			$stdcpp = 1;
+			next;
+		}
+		if ($arg =~ /^-cpp=(.*)/)
+		{
+			if ($stdcpp)
+			{
+				die "Error: -stdcpp option and -cpp=xxx option cannot be used at the same time.\n";
+			}
+			if ($cppoption)
+			{
+				print "Warning: -cpp option has been set before. The previous configuration will be overwritten!\n";
+			}
+			$cppoption = 1;
+			$preprocessor = $1;
+			$preprocessor =~ s-\\-\/-g;
+			$preprocessor =~ s-EPOCROOT##\/?-$epocroot-g;
+			if (-d $preprocessor)
+			{
+				$preprocessor .= "\/" unless $preprocessor =~ /\/$/;
+				$preprocessor .= "cpp";
+			}
+			next;
+		}
+		if ($arg =~ /^-prependepocroot$/)
+		{
+			$prependepocroot = 1;
+			next;
+		}
+		    if($arg =~/^-c(.*)/)
 {
 if($1 eq 'none' )
 {
 $opt_compression = " -compressionmethod none";
 }
 				next;
 			}
 			else
 			{
 				$ZDirloc  = $1;
-				if( $ZDirloc !~ m/\\(\Z)/)
+				$ZDirloc =~ s-\\-\/-g;
+				if( $ZDirloc !~ m/\/(\Z)/)
 				{
-					$ZDirloc .= "\\";
+					$ZDirloc .= "\/";
 				}
 				if( $ZDirloc !~ m/:/)
 				{
 					print "drive letter not specified\n";
-					$ZDirloc = &datadriveimage::setPath($ZDirloc);
+					$ZDirloc = $thisdir.$ZDirloc;
 				}
 				print "Z Drive directory location = $ZDirloc\n";
 				#set the location of Z Drive directory.
 				$ZDirloc .= "zdrive";
 			}
 				next;
 			}
 			else
 			{
 				$DataDriveDirloc = $1;
-				if( $DataDriveDirloc !~ m/\\(\Z)/)
+				$DataDriveDirloc =~ s-\\-\/-g;
+				if( $DataDriveDirloc !~ m/\/(\Z)/)
 				{
-					$DataDriveDirloc .= "\\";
+					$DataDriveDirloc .= "\/";
 				}
 				if( $DataDriveDirloc !~ m/:/)
 				{
 					print "drive not specified\n";
-					$DataDriveDirloc = &datadriveimage::setPath($DataDriveDirloc);
+					$DataDriveDirloc = $thisdir.$DataDriveDirloc;
 				}
 				print "Data Drive directory location = $DataDriveDirloc\n";
 				#set the location of Data Drive directory.
 				$DataDriveDirloc .= "datadrive";
 			}
 			$paraFile = $1;
 			next;
 	    }
 		if ( $arg =~ /^-l=(.*)/i || $arg =~ /^-logimageentry=(.*)/i )
 	    {
-			if( $1 =~/\\/ || $1 =~ m/:/)
+			if( $1 =~/[\/\\]/ || $1 =~ m/:/)
 			{
 				print "* Warning: Invalid log file extension try filename.txt\n";
 				next;
 			}
 			else
 	    # It's an OBY file
 	    next if (match_obyfile($arg));
 	    next if (match_obyfile("$arg.oby"));
 	    print "Cannot find oby file: $arg\n";
-	    $errors++;
+	    $errors++ if(!$opt_k);
 	}
 	if (defined $paramFileFlag)
 	{
 		return;
 	}
 	if (@obyfiles<1)
 	{
 	    print "Missing obyfile argument\n";
-	    $errors++;
+	    $errors++ if(!$opt_k);
+	}
+	if(defined($obycharset))
+	{
+		unless($obycharset =~ /utf-?8/i)
+		{
+			print "Warning: Ignoring not supportted charset $obycharset, local charset will be used as default!\n";
+		}
 	}
 	if ($errors)
 	{
 	    print_usage();
 	# Adding variant specific macros by including a HRH file
 	# (only required if no Feature Variant is used)
 	if (!$featureVariant{'VALID'})
 	{
-	    my $variantMacroHRHFile = Variant_GetMacroHRHFile();
+	    my $variantMacroHRHFile = get_variantmacroHRHfile();
 	    if($variantMacroHRHFile){
+	        my $variantFilePath = split_path('Path',$variantMacroHRHFile);
-	        my $variantFilePath = Path_Split('Path',$variantMacroHRHFile);
+	        $cppargs .= " -I " . &append_driveandquote($variantFilePath) . " -include " . &append_driveandquote($variantMacroHRHFile);
-	        $cppargs .= " -I \"" . &Path_RltToWork($variantFilePath) . "\" -include \"" . &Path_RltToWork($variantMacroHRHFile) . "\"";
+	        print "in cmd process $cppargs\n" if ($opt_v);
 	    }
 	}
 	# load the required modules if xml is required
 	if ($xmlrequired == 1)
 	{
-	    my $epocToolsPath = $ENV{EPOCROOT}."epoc32\\tools\\";
-	    Load_SetModulePath($epocToolsPath);
 	    if (defined ($featureXml))
 	    {
 			load_featuresutil();
 	    }
 	    if ($image_content)
 	    {
-	    	&Load_ModuleL("ImageContentHandler");
+	    	&FlexLoad_ModuleL("ImageContentHandler");
 	    	# some variables for ImageContentHandler may have been setup
 	    	my ($key, $value);
-	    	&ImageContentHandler::SetBldRomOpts; # Defaults to ARMV5 platform
+	    	&ImageContentHandler::SetBldRomOpts; # Defaults to armv5 platform
 	    	while (($key,$value) = each %tmpBldRomOpts)
 	    	{
 			&ImageContentHandler::SetBldRomOpts($key, $value);
 	    	}
 	    }
 # Concatentate the specified .oby files and pass them through cpp
 # to get the raw ROM specification in tmp1.oby
 sub preprocessing_phase
 {
-	unlink "tmp1.oby";
+	my $temp1OBYFile = $thisdir."tmp1.oby";
+	unlink "$temp1OBYFile";
 #	Macro "ROM_FEATURE_MANAGEMENT" is defined when "-f|fr" or "-fm" is used
 	if (defined ($featureXml))
 	{
 		$cppargs .= " -DROM_FEATURE_MANAGEMENT ";
 		}
 	}
 	else
 	{
 		# no feature variant so use the standard includes
-		$cppargs .= " -I. -I$rominclude";
+		$cppargs .= " -I. -I \"$rominclude\"";
 	}
-	print "* cpp -o tmp1.oby $cppargs\n" if ($opt_v);
+	if ($stdcpp)
+	{
+		$preprocessor = find_stdcpp();
+	}
+	print "* $preprocessor -Wno-endif-labels -o $temp1OBYFile $cppargs\n" if ($opt_v);
+	is_existinpath("$preprocessor", romutl::DIE_NOT_FOUND);
 	$errors = 0;
-	open CPP, "| cpp -o tmp1.oby $cppargs" or die "* Can't execute cpp";
+	open CPP, "| $preprocessor -Wno-endif-labels -o $temp1OBYFile $cppargs" or die "* Can't execute cpp";
 	foreach my $arg (@obyfiles)
 	{
 		print CPP "\n#line 1 \"$arg\"\n";
-		open OBY, $arg or die "* Can't open $arg";
+		if(open(OBY, $arg)) {
-		print "* reading $arg\n" if ($opt_v);
+			print "* reading $arg\n" if ($opt_v);
-		while ($line=<OBY>)
+			while ($line=<OBY>) {
-		{
+				print CPP $line;
-			print CPP $line;
+			}
-		}
+			close OBY;
-		close OBY;
+		}
+		else {
+			print STDERR "* Can't open $arg\n";
+			if(!$opt_k){
+				close CPP;
+				exit(1);
+			}
+		}
 	}
 	close CPP;
 	my $cpp_status = $?;
-	die "* cpp failed\n" if ($cpp_status != 0 || !-f "tmp1.oby");
+	die "* cpp failed\n" if ($cpp_status != 0 || !-f "$temp1OBYFile");
-	my $temp1OBYFile = "tmp1.oby";
 	if( defined ($image_content))
 	{
 		#Read the OBY file that was generated by the pre-processor
 		&ReadPreprocessedFile($temp1OBYFile);
 		&ImageContentHandler::GenObyFile($temp1OBYFile);
 	}
 	# Setup default rom configuration
 	$romimage[0] = {xip=>1, compress=>0, extension=>0, composite=>"none",uncompress=>0 };
+	if($obycharset =~ /utf-?8/i)
+	{
+		my $utf8file = $thisdir."tmp1utf8.oby";
+		open INFILE, "<$temp1OBYFile" or die "* Can't open file $temp1OBYFile";
+		open CHARSETTRAN, "| charsettran -to=hostcharset > $utf8file" or die "* Can't execute charsetran";
+		while(<INFILE>)
+		{
+			print CHARSETTRAN $_;
+		}
+		close CHARSETTRAN;
+		close INFILE;
+		unlink $temp1OBYFile  or die "* Can't remove file $temp1OBYFile";
+		rename 	$utf8file, $temp1OBYFile or die "* Can't rename file $utf8file to file $temp1OBYFile";
+	}
 }
 sub ReadPreprocessedFile
 {
 #	Read the OBY file that was generated by the pre-processor. This OBY is a conglomeration of all the OBYs
 	while($tmpline =<OBYFH>) {
 		if ($tmpline=~/(\S+)\s*=\s*(\S+)\s+(\S+)/) {#Get the first parameter (source File path) from oby line
 			$srcFilePath = $2;
 			$dstFilePath = $3;
-			if ($srcFilePath=~/.*\\(\S+)/) {
+			if ($srcFilePath=~/.*[\/\\](\S+)/) {
 				$srcFileName = $1;
 			}
-			if ($dstFilePath=~/.*\\(\S+)/) {
+			if ($dstFilePath=~/.*[\/\\](\S+)/) {
 				$dstFileName = $1;
 			}
 			my $binaryInfoRef = &cdfparser::GetBinaryInfo($dstFileName);
 			if(defined($binaryInfoRef))
 		$substitutionData{"RIGHT_NOW"} = sprintf("%02d/%02d/%04d %02d:%02d:%02d", $mday, $mon+1, $year+1900, $hour, $min, $sec);
 		$substitutionData{"EPOCROOT"} = $epocroot;
 		@substitutionOrder = ("TODAY", "RIGHT_NOW", "EPOCROOT");
 	}
+	my $temp1OBYFile = $thisdir."tmp1.oby";
-	open TMP1, "tmp1.oby" or die("* Can't open tmp1.oby\n");
+	open TMP1, "$temp1OBYFile" or die("* Can't open $temp1OBYFile\n");
 	while ($line=<TMP1>)
 	{
 		if(($line =~ /^\s*romsize\s*=/i) || ( $line=~ /^\s*rom_image/i) || ($line =~ /^\s*data_image/i))
 		{
 			$onlysmrimage = 0;
 			last;
 		}
 	}
 	close TMP1;
 	if ($enforceFeatureManager && (!$featuremanager) && (!$noFeatureManager) )
 	{
 		my $defaultFeatureDbFlag = 0;
-		open TMP1, "tmp1.oby" or die("* Can't open tmp1.oby\n");
+		open TMP1, "$temp1OBYFile" or die("* Can't open $temp1OBYFile\n");
 		while ($line=<TMP1>)
 		{
 			if ($line=~/^\s*defaultfeaturedb\s*=?\s*(\S+)/i)
 			{
 				# Get the default value for featuredatabasefile
 				$featureXml = "$epocroot$1";
+				$featureXml =~ s-\\-\/-g;
 				$featuremanager = 1;
 				$defaultFeatureDbFlag = 1;
 				load_featuresutil();
 				last;
 			}
 			print "Error: Neither option \"-fm|-nofm\" nor default value for featuredatabase file is provided.\n";
 			exit(1);
 		}
 	}
-	open TMP1, "tmp1.oby" or die("* Can't open tmp1.oby\n");
+	open TMP1, "$temp1OBYFile" or die("* Can't open $temp1OBYFile\n");
 	while ($line=<TMP1>)
 	{
 		track_source($line);
+		$line =~ s-\\-\/-g;
+		if ($prependepocroot)
+		{
+			my $tempstring = $epocroot."epoc32\/";
+			if(($line !~ /^\s*\#/) && ($line =~ /\/epoc32\//i)
+			 && ($line !~ /EPOCROOT##\/?epoc32\//i) && ($line !~ /$tempstring/i))
+			{
+				print "add EPOCROOT for line: $line\n" if ($opt_v);
+		  	$line =~ s-\/epoc32-EPOCROOT##epoc32-ig;
+			}
+		}
 		#
 		# Recognise keywords in lines that we process before substitution
 		#
 		# # lineno "file" flagno
 		# DEFINE name replacement-with-0-spaces
 		push @obydata, $line;
 	}
 	close TMP1;
 	exit(1) if ($errors);
 	dump_obydata("tmp2.oby", "result of substitution phase") if ($opt_v);
 }
 sub check_romimage
 {
 }
 sub dump_obydata
 {
 	my ($dumpfile, $comment) = @_;
+	$dumpfile = $thisdir.$dumpfile;
 	unlink($dumpfile);
 	open DUMPFILE, ">$dumpfile" or die("* Can't create $dumpfile\n");
 	print "* Writing $dumpfile - $comment\n";
 	my $line;
 	foreach $line (@obydata)
 	my ($line) = @_;
 	if ($line=~/^# (\d+) "(.*)"/)
 	{
 		$sourceline=$1-1;
 		$sourcefile=$2;
-		$sourcefile=~ s/\//\\/g;
 		$sourcefile=~ s/\\\\/\\/g;
+		$sourcefile=~ s/\\/\//g;
 		return;
 	}
 	$sourceline++;
 }
 				push @linesArray, $modifiedLine;
 				$line = "REM handled $line";
 			}
 			elsif($smrImageStartRegion && !$smrImageEndRegion)
 			{
-				if($line =~ /^\s*IMAGENAME\s*=\s*(\S+)/i)
+				if($line =~ /^(\s*IMAGENAME\s*=\s*)(\S+)/i)
 				{
-					my $smrimagename = $1;
+					my $front = $1;
+					my $smrimagename = $2;
+					if ($smrimagename !~ /^.:/ && $smrimagename !~ /^[\\\/]/)
+					{
+						$smrimagename = $thisdir.$smrimagename;
+					}
 					$smrimagename =~s/(\.img)//i;
 					if(exists($smrNameInfo{$smrimagename}))
 					{
 						$smrNameInfo{$smrimagename}++;
 					}
 					else
 					{
 						$smrNameInfo{$smrimagename} = 1;
 					}
-					$line =~s/(\.img)//i;
+					push @linesArray, "$front$smrimagename\n";
-				}
+				}else
-				push @linesArray, $line;
+				{
+					push @linesArray, $line;
+				}
 				$line = "REM handled $line";
 			}
 		}
 		elsif (scalar @currentpartition)
 		{
 					print ("Warning: SPI creation/placement flag not enabled. Ignoring SPI_POSITION\n" ) if ($opt_v);
 				}
 			}
 			# a partition is specified
 			# push this line into the currently selected partition
-			my $partition=@currentpartition[-1];
+			my $partition=$currentpartition[-1];
 			push @$partition, $modifiedLine;
 			$line="REM handled $line";
 		}
 		elsif ($line =~ /^\s*SPI_POSITION/i)
 		{
 		      $errors++ if ($strict);
 		    }
 		    if ($spidatahide)
 		    {
-			push @newobydata, "hide=$fileRomDir\\$pluginFileName\n";
+			push @newobydata, "hide=$fileRomDir\/$pluginFileName\n";
 		    }
 		    else
 		    {
-		    	push @newobydata, "file=$emulatorDir\\$pluginFileName $fileRomDir\\$pluginFileName $paged_data\n";
+		    	push @newobydata, "file=$emulatorDir\/$pluginFileName $fileRomDir\/$pluginFileName $paged_data\n";
 		    }
 		    if($createspi) {
 		    	    if ($spidatahide)
 			    {
-			    	push @newobydata, "spidatahide=MULTI_LINGUIFY(RSC $dataz_\\$resourceDir\\$pluginResourceName $resourceDir\\$pluginResourceName) " . lc($plugintype) . "\.spi " . $plugintypes{$plugintype} . "\n";
+			    	push @newobydata, "spidatahide=MULTI_LINGUIFY(RSC $dataz_\/$resourceDir\/$pluginResourceName $resourceDir\/$pluginResourceName) " . lc($plugintype) . "\.spi " . $plugintypes{$plugintype} . "\n";
 			    }
 			    else
 			    {
-			    	push @newobydata, "spidata=MULTI_LINGUIFY(RSC $dataz_\\$resourceDir\\$pluginResourceName $resourceDir\\$pluginResourceName) " . lc($plugintype) . "\.spi " . $plugintypes{$plugintype} . "\n";
+			    	push @newobydata, "spidata=MULTI_LINGUIFY(RSC $dataz_\/$resourceDir\/$pluginResourceName $resourceDir\/$pluginResourceName) " . lc($plugintype) . "\.spi " . $plugintypes{$plugintype} . "\n";
 			    }
 		  	} else {
 		    	    if ($spidatahide)
 			    {
-			    	push @newobydata, "hide=MULTI_LINGUIFY(RSC $dataz_\\$resourceDir\\$pluginResourceName $resourceDir\\$pluginResourceName)\n";
+			    	push @newobydata, "hide=MULTI_LINGUIFY(RSC $dataz_\/$resourceDir\/$pluginResourceName $resourceDir\/$pluginResourceName)\n";
 			    }
 			    else
 			    {
-			    	push @newobydata, "data=MULTI_LINGUIFY(RSC $dataz_\\$resourceDir\\$pluginResourceName $resourceDir\\$pluginResourceName)\n";
+			    	push @newobydata, "data=MULTI_LINGUIFY(RSC $dataz_\/$resourceDir\/$pluginResourceName $resourceDir\/$pluginResourceName)\n";
 			    }
 			}
 				return 1; #successful match
 	   }
 }
 			# ignore REM statements, to avoid processing "REM data=xxx yyy"
 		}
 		elsif ($line=~/^(.*?)\bMULTI_LINGUIFY\s*\(\s*(\S+)\s+(\S+)\s+(\S+)\s*\)(.*)$/i)
 		{
 			my $initialStuff=$1;
+			$initialStuff = lc ($initialStuff);# if ($enableLowercaseTransfer);
 			my $defaultFileNameExtension=$2;
+			$defaultFileNameExtension = lc ($defaultFileNameExtension);# if ($enableLowercaseTransfer);
 			my $sourceFileNameWithoutExtension=$3;
+			$sourceFileNameWithoutExtension = ($sourceFileNameWithoutExtension);# if ($enableLowercaseTransfer);
 			my $targetFileNameWithoutExtension=$4;
 			my $finalStuff=$5;
 			my $spidataflag = 0;
 			my $spidatahide = 0;
 			my $datahide = 0;
 # ecom.spi should contain the .RSC files
 			if ($spidataflag)
 			{
 				my $sourceFileNameExtension = $defaultFileNameExtension;
 				my $targetFileNameExtension = $defaultFileNameExtension;
-				if (-e "$sourceFileNameWithoutExtension.$sourceFileNameExtension")
+				if (-e ("$sourceFileNameWithoutExtension.$sourceFileNameExtension"))
 				{
 					if ($spidatahide)
 					{
 						push @newobydata, "$initialStuff$sourceFileNameWithoutExtension.$sourceFileNameExtension$finalStuff\n";
 					}
 			}
 			my $useDefaultFileNameExtension=1;
 			foreach my $languageCode (keys %languageCodes) {
 				my $sourceFileNameExtension=$defaultFileNameExtension;
 				$sourceFileNameExtension=~s/^(.*).{2}$/$1$languageCode/;
-				if (! -e "$sourceFileNameWithoutExtension.$sourceFileNameExtension")
+				if (! -e ("$sourceFileNameWithoutExtension.$sourceFileNameExtension"))
 				{
 					if (!$spidataflag)
 					{
 						next if (!$useDefaultFileNameExtension);
 						next if (defined $defaultLanguageCode and !($languageCode eq $defaultLanguageCode));
 				{
 					push @newobydata, "$initialStuff$sourceFileNameWithoutExtension.$sourceFileNameExtension $targetFileNameWithoutExtension.$sourceFileNameExtension$modifiedfinalStuff\n";
 					if(!($sourceFileNameExtension eq $targetFileNameExtension))
 					{
 						push @newobydata, "alias $targetFileNameWithoutExtension.$sourceFileNameExtension $targetFileNameWithoutExtension.$targetFileNameExtension $modifiedfinalStuff\n";
+						$targetFileNameWithoutExtension =~ s-\\-\/-g;
 						$multiLinguifyAlias{"$targetFileNameWithoutExtension.$sourceFileNameExtension"} = 1;
 					}
 				}
 			}
 			$line = reassert_sourceline();
 			{
 				push @hidedatainspi, $hidedatafiles[$j]{data}; #push name of data file to be hidden onto array if correct romimage and spi type
 			}
 		}
 		my @spiargs; #arguments passed to createSpi
-		push @spiargs, ("-t$targetspi", "-d\\$thisdir", "-hide@hidedatainspi");
+		push @spiargs, ("-t$targetspi", "-d$thisdir", "-hide@hidedatainspi");
 		if($existingspi ne "") { push @spiargs, $existingspi; }
 		&spitool::createSpi(@spiargs, @dataforspi); # external call to
 	}
 }
 next if (!$spipositionflag{$imageIdx});#This spi has already been entered into OBY.
 my $spiIdx=0;
 while(defined $spiarray[$imageIdx][$spiIdx]) {
 if($spiarray[$imageIdx][$spiIdx]{spifile} =~ /(.+)\.(.*)$/) {
 my $targetspi="$1-$imageIdx-$spiIdx\.$2";
-push @newobydata, "data=" . "\\$thisdir" . $targetspi . " \"" . $spiarray[$imageIdx][$spiIdx]{spi} . "\"\n";
+push @newobydata, "data=" . "$thisdir" . $targetspi . " \"" . $spiarray[$imageIdx][$spiIdx]{spi} . "\"\n";
 }
 $spiIdx++;
 }
 if($spiIdx == 0){
 # If there is no plugin in this image, the SPI_POSITION statement is ignore.
 					$flag=0;
 					my $k=0;
 					while(defined $spiarray[0][$k]) {
 						if($spiarray[0][$k]{spifile} =~ /(.+)\.(.*)$/) {
 							my $targetspi="$1-0-$k\.$2";
-							push @newobydata, "data=" . "\\$thisdir" . $targetspi . " \"" . $spiarray[0][$k]{spidir} . $targetspi .  "\"\n";
+							push @newobydata, "data=" . "$thisdir" . $targetspi . " \"" . $spiarray[0][$k]{spidir} . $targetspi .  "\"\n";
 						}
 						$k++;
 					}
 				}
 				my $j=0;
 				push @newobydata, "\n" . $line . "\n";
 				while(defined $spiarray[$romimage][$j]) { #put in SPI files for current ROM_IMAGE
 					if($spiarray[$romimage][$j]{spifile} =~ /(.+)\.(.*)$/) {
 						my $targetspi="$1-$romimage-$j\.$2";
-						push @newobydata, "data=" . "\\$thisdir" . $targetspi . " \"" . $spiarray[$romimage][$j]{spidir} . $targetspi .  "\"\n";
+						push @newobydata, "data=" . "$thisdir" . $targetspi . " \"" . $spiarray[$romimage][$j]{spidir} . $targetspi .  "\"\n";
 					}
 					$j++;
 				}
 			} elsif($line =~ /^\s*extensionrom/i) {
 				if($flag) { #put in SPI files
 					my $k=0;
 					while(defined $spiarray[0][$k]) {
 						if($spiarray[0][$k]{spifile} =~ /(.+)\.(.*)$/) {
 							my $targetspi="$1-0-$k\.$2";
-							push @newobydata, "data=" . "\\$thisdir" . $targetspi . " \"" . $spiarray[0][$k]{spidir} . $targetspi . "\"\n";
+							push @newobydata, "data=" . "$thisdir" . $targetspi . " \"" . $spiarray[0][$k]{spidir} . $targetspi . "\"\n";
 						}
 						$k++;
 					}
 					$flag = 0;
 				}
 		if($flag) { #put in SPI files for ROM_IMAGE[0] if it is the only ROM_IMAGE
 			my $k=0;
 			while(defined $spiarray[0][$k]) {
 				if($spiarray[0][$k]{spifile} =~ /(.+)\.(.*)$/) {
 					my $targetspi="$1-0-$k\.$2";
-					push @newobydata, "data=" . "\\$thisdir" . $targetspi . " \"" . $spiarray[0][$k]{spidir} . $targetspi . "\"\n";
+					push @newobydata, "data=" . "$thisdir" . $targetspi . " \"" . $spiarray[0][$k]{spidir} . $targetspi . "\"\n";
 				}
 				$k++;
 			}
 		}
 		@obydata=@newobydata;
 	dump_obydata("tmp6.oby", "result of SPI stage") if ($opt_v);
 }
 sub load_featuresutil
 {
-	&Load_ModuleL("featuresutil");
+	&FlexLoad_ModuleL("featuresutil");
 	# Parse the feature database XML file
 	if(!&featuresutil::parseXMLDatabase($featureXml, $featuremanager, $strict))
 	{
 		$featureXml = undef;
 	}
 	# Set the name and Rom Image location of feature file.
 	if ($enforceFeatureManager)
 	{
 		# features data file location
-		$dir = "private\\10205054\\";
+		$dir = "private\/10205054\/";
 		$featurefilename = "features.dat";
 	}
 	else
 	{
 		# feature registry configuration file location
-		$dir = "private\\102744CA\\";
+		$dir = "private\/102744CA\/";
 		$featurefilename = "featreg.cfg";
 	}
 	if (defined ($featureXml))
 	{
 		my $featurefilecount=0;
 		for(my $i=0;$i<scalar @featurefilearray;$i++)
 		{
 			my $j=0;
 			while(defined $featurefilearray[$i][$j])
 			{
-				my $targetfeaturefile = $featurefilearray[$i][$j]{cfgfile};
+				my $targetfeaturefile = $thisdir.$featurefilearray[$i][$j]{cfgfile};
 				if (!(&featuresutil::createFeatureFile($i,$j,$targetfeaturefile,\@featureslist,$featuremanager)))
 				{
 					$featurefilearray[$i][$j]{cfgfile}= undef;
 					exit(1) if($strict);
 				}
 					while(defined $featurefilearray[0][$k])
 					{
 						my $targetfeaturefile=$featurefilearray[0][$k]{cfgfile};
 						if (defined $targetfeaturefile)
 						{
-							push @newobydata, "data=" . "\\$thisdir" . $targetfeaturefile . " \"" . $featurefilearray[0][$k]{cfgdir} . $targetfeaturefile .  "\"\n";
+							push @newobydata, "data=" . "$thisdir" . $targetfeaturefile . " \"" . $featurefilearray[0][$k]{cfgdir} . $targetfeaturefile .  "\"\n";
 						}
 						$k++;
 					}
 				}
 				push @newobydata, "\n" . $line . "\n";
 					# list with mangled names. Hence, mangled name for feature files should not be put in ROM_IMAGE.
 					my $exattribute = "exattrib=U";
 					if (defined $targetfeaturefile)
 					{
-						push @newobydata, "data=" . "\\$thisdir" . $targetfeaturefile . " \"" . $featurefilearray[$romimage][$j]{cfgdir} . $destinationfeaturefile .  "\"\t\t" . $exattribute . "\n";
+						push @newobydata, "data=" . "$thisdir" . $targetfeaturefile . " \"" . $featurefilearray[$romimage][$j]{cfgdir} . $destinationfeaturefile .  "\"\t\t" . $exattribute . "\n";
 					}
 					$j++;
 				}
 			}
 			elsif($line !~ /^\s*(FEATURE)\s*/i && $line !~ /^\s*(EXCLUDE_FEATURE)\s*/i)
 			while(defined $featurefilearray[0][$k])
 			{
 				my $targetfeaturefile = $featurefilearray[0][$k]{cfgfile};
 				if (defined $targetfeaturefile)
 				{
-					push @newobydata, "data=" . "\\$thisdir" . $targetfeaturefile . " \"" . $featurefilearray[0][$k]{cfgdir} . $targetfeaturefile . "\"\n";
+					push @newobydata, "data=" . "$thisdir" . $targetfeaturefile . " \"" . $featurefilearray[0][$k]{cfgdir} . $targetfeaturefile . "\"\n";
 				}
 				$k++;
 			}
 		}
 		@obydata=@newobydata;
 	elsif ($enforceFeatureManager)
 	{
 	    print "Error: no feature data file or pre-built feature data file is provided!";
 	    exit(1);
 	}
+	checkcase() if ($checkcase);
 }
 my ($fromABI,$toABI) = split / /,$abiDowngrade;
 #----------------------------------------------------------------------------------
 # Problem suppression phase
 # correct source binary name using the VMAP file mechanism.
 sub suppress_phase
 {
 	undef @newobydata;
-	Plat_Init($PerlLibPath);
+	init_plat($PerlEPOCPath);
 	# use the "default" feature variant by default.
 	my $varname = $featureVariant{'VALID'} ? $featureVariant{'NAME'} : "default";
 	foreach $line (@obydata)
 	{
 		track_source($line);
-		if ($line =~ /^\s*REM/i)
+		if ($line =~ /^\s*REM/i || $line =~ /^\s*TIME\s*=\s*/i)
 		{
 			# ignore REM statements, to avoid processing "REM data=xxx yyy"
 		}
 		#
 		# thing=some\file
 		#
-		elsif ($line =~ /(\S+)\s*=\s*"?(\S+\\\S+)"?/)
+		elsif ($line =~ /(\S+)\s*=\s*"?(\S+[\/\\]\S+)"?/)
 		{
 			my $what = $1;
 			my $filename = $2;
 			if ($line =~ /(\S+)\s*=\s*"([^"]+)"/)
 			{
 				$filename = $2;
 			}
-			my $normedFilename = &Genutl_NormaliseVersionedName($filename);
+			my $normedFilename = &get_versionedname($filename);
 			# find all the alternative file locations
 			my @alternatives = fallback($normedFilename);
 			# test the original location first
 			unshift(@alternatives, $normedFilename);
 			my $fileExists = 0;
 			foreach my $altFile (@alternatives)
 			{
 			    my $tmpPath;
 			    my $tmpFile;
-				if($altFile =~ /"?(.*\\arm\w+_?\w+)\\([^"]+)/i)
+				if($altFile =~ /"?(.*[\/\\]arm\w+_?\w+)[\/\\]([^"]+)/i)
 				{
 					$tmpPath = $1;
 					$tmpFile = $2;
 				}
 				$tmpPath .= "\.$varname";
-				if (-d $tmpPath){
-				  if (-e $tmpPath ."\\$tmpFile"){
+				if (-e $tmpPath ."\/$tmpFile"){
-				   $fileExists = $tmpPath . "\\$tmpFile";
+# SBSv2 variant binary exists
-				  }
+				  $fileExists = $tmpPath . "\/$tmpFile";
-				  elsif (-e $altFile){
-				   $fileExists = $altFile;
-				  }
 				}
 				else {
-				  $fileExists = featurevariantmap->Find($altFile, $varname);
+# SBSv1 variant binary or invariant binary
+				  $fileExists = get_BVbinname($altFile, $varname);
 				}
 				last if $fileExists;
 			}
 			# edit the OBY line to use the actual file name which we found.
 			# (maybe) warn if an alternative to the original was selected.
 			if ($fileExists)
 			{
 				my $from = $filename;
-				$from =~ s/\\/\\\\/g;		# need to escape backslashes
+				$from =~ s/\\/\\\\/g;
+				$from =~ s/\//\\\//g;		# need to escape backslashes
 				$from =~ s/(\[|\])/\\$1/g;	# need to escape square brackets for file names like "featreg.cfg[x-y]",etc.
 				my $into = $fileExists;
-				$line =~ s/$from/$into/;
+				$line =~ s/$from/$into/i;
 				if ($warnSelection && ($fileExists ne $normedFilename))
 				{
 			    	print "replaced $filename with $fileExists\n";
 				}
 			{
 				# No suitable alternative was found, so comment out the line unless
 				# it is a manatory ROMBUILD keyword, in which case it is better
 				# to let ROMBUILD report the missing file rather than report the
 				# missing keyword.
-				if ($what !~ /^bootbinary|variant|primary|secondary|hide/i)
+				if ($what !~ /^bootbinary|variant|primary|secondary|hide|dir|imagename/i)
 				{
 					$line = "REM MISSING " . $line;
 					print_source_error("Missing file: '$filename' in statement '$what='");
 					print "\ttried @alternatives\n"  if ($opt_v && @alternatives > 1);
 					# treat as an error if the strict option is selected.
 				if($aSrcfile =~ /"?([^"]+)/){
 				$aSrcfile = $1;
 				}
-				$aSrcfile = &Genutl_NormaliseVersionedName($aSrcfile);
+				$aSrcfile = &get_versionedname($aSrcfile);
-				if($dstFile =~ /"?(.*)\\([^"]+)/)
+				if($dstFile =~ /"?(.*)[\/\\]([^"]+)/)
 				{
 					$dstPath = $1;
 					$dstFile = $2;
 				}
 				my $dllMapKey = lc ($dstFile);
 			}
 		}
 		push @newobydata, $line;
 	}
 	@obydata = @newobydata;
 	dump_obydata("tmp7.oby", "result of problem-suppression phase") if ($opt_v);
 	die "ERROR: $errors missing file(s) detected\n" if ($strict && $errors );
 }
 	# If BINARY_SELECTION_ORDER macro is specified in the oby file
 	if ($binarySelectionOrderFlag)
 	{
 		# Search in the specified binary order
-		if(!defined(@Global_PlatList))
+		if(scalar(@Global_PlatList) == 0)
 		{
-			@Global_PlatList = Plat_List();
+			@Global_PlatList = get_platlist();
 		}
 		my $b;
 		my $e;
 		foreach my $plat (@Global_PlatList)
 		{
-			if ($file =~ /^(.*)\\$plat\\(.*)$/i)
+			if ($file =~ /^(.*)[\/\\]$plat[\/\\](.*)$/i)
 			{
 				$b = $1;
 				$e = $2;
 				last;
 			}
 		}
-		push(@alternatives, "$b\\$firstDIR\\$e");
+		push(@alternatives, "$b\/$firstDIR\/$e");
 		foreach my $toDIR (@binarySelectionOrder)
 		{
-			push(@alternatives, "$b\\$toDIR\\$e");
+			push(@alternatives, "$b\/$toDIR\/$e");
 		}
 	}
-	# If the file is not found in the specified ABIV2 platform, then select from ARMV5 directory.
+	# If the file is not found in the specified ABIV2 platform, then select from armv5 directory.
-	# This is necessary as some of the runtime DLLs will be present only in ARMV5 directory.
+	# This is necessary as some of the runtime DLLs will be present only in armv5 directory.
 	# Add the BPABI Platforms to be added
-	if(!defined(@Global_BPABIPlats))
+	if(scalar(@Global_BPABIPlats) == 0)
 	{
-		@Global_BPABIPlats = &BPABIutl_Plat_List;
+		@Global_BPABIPlats = &get_bpabiplatlist;
 	}
 	foreach my $BpabiPlat (@Global_BPABIPlats)
 	{
-		if ($fromABI eq "" && $file =~ /^(.*)\\$BpabiPlat\\(.*)$/)
+		if ($fromABI eq "" && $file =~ /^(.*)[\/\\]$BpabiPlat[\/\\](.*)$/i)
 		{
-			push(@alternatives, "$1\\armv5\\$2");
+			push(@alternatives, "$1\/armv5\/$2");
 		}
 	}
-	if ($customizedPlat && $fromABI eq "" && $file =~ /^(.*)\\$customizedPlat\\(.*)$/)
+	if ($customizedPlat && $fromABI eq "" && $file =~ /^(.*)[\/\\]$customizedPlat[\/\\](.*)$/i)
 	{
 		my $b = $1;
 		my $e = $2;
 		# if platform customization
-		my $rootPlat = Plat_Root($customizedPlat);
+		my $rootPlat = get_platroot($customizedPlat);
 		#Check in ARMV7 folder for binaries in case GCCEV7 is used [DEF128457 ]
 		if($customizedPlat == "GCCEV7")
 		{
-			push(@alternatives,"$b\\armv7\\$e");
+			push(@alternatives,"$b\/armv7\/$e");
 		}
 		if( grep /$rootPlat/, @Global_BPABIPlats)
 		{
-			push(@alternatives, "$b\\armv5\\$e");
+			push(@alternatives, "$b\/armv5\/$e");
 		}
 	}
-	if ($fromABI eq "" && $file =~ /^(.*)\\ARMV5_ABIV1\\(.*)$/i)
+	if ($fromABI eq "" && $file =~ /^(.*)[\/\\]armv5_abiv1[\/\\](.*)$/i)
 	{
-		push(@alternatives, "$1\\armv5\\$2");
+		push(@alternatives, "$1\/armv5\/$2");
 	}
-	if ($fromABI ne "" && $file =~ /^(.*)\\$fromABI\\(.*)$/)
+	if ($fromABI ne "" && $file =~ /^(.*)[\/\\]$fromABI[\/\\](.*)$/)
 	{
-		push(@alternatives, "$1\\$toABI\\$2");
+		push(@alternatives, "$1\/$toABI\/$2");
 	}
 	return @alternatives;
 }
 {
 	my $file = shift;
 	my @alternatives;
 	$customizedPlat = undef;	# global (used in feedback)
-	if(!defined(@Global_PlatList))
+	if(scalar(@Global_PlatList) == 0)
 	{
-		@Global_PlatList = Plat_List();
+		@Global_PlatList = get_platlist();
 	}
 	foreach my $plat (@Global_PlatList)
 	{
-		if ($file =~ /^(.*)\\$plat\\(.*)$/i)
+		if ($file =~ /^(.*)[\/\\]$plat[\/\\](.*)$/i)
 		{
 			my $b = $1;
 			my $e = $2;
-			my $root = Plat_Customizes($plat);
+			my $root = get_platcustomizes($plat);
 			if ($root)
 			{
 				# Preserve the plat that is customized
 				$customizedPlat = $plat;
 				# If a BSF platform customizes another BSF platform (i.e. a
 				# BSF hierarchy exists), look for the file starting from the
 				# child BSF platform and working back to the root BSF platform
 				while ($root)
 				{
-					push(@alternatives, "$b\\$root\\$e");
+					push(@alternatives, "$b\/$root\/$e");
-					# Temporary special case for ARMV5_ABIV1 and ARMV5_ABIV2
+					# Temporary special case for armv5_abiv1 and armv5_abiv2
 					if ($root =~ /^armv5_abiv[12]$/i)
 					{
-						push(@alternatives, "$b\\armv5\\$e");
+						push(@alternatives, "$b\/armv5\/$e");
 					}
-					$root = Plat_Customizes($root);
+					$root = get_platcustomizes($root);
 				}
 			}
 			return @alternatives;
 		}
 	}
 		# bitmap=source dest
 		#
 		if ($line =~ /^\s*bitmap=\s*"?(\S+)"?\s+"?(\S+)"?/i)
 		{
 			my $mbm = $1;
 			my $dest = $2;
 			my $rom_mbm = "$1_rom";
 			if ($is_xip eq 0)
 			{
 				# non-XIP rom - just include the mbm file
 				$line = "data=\"$mbm\"\t\"$dest\"\n";
 			}
 			else
 			{
 		        if (! -e $rom_mbm || -M $rom_mbm >= -M $mbm)
 			    {
-				    system "bmconv /q /r $rom_mbm /m$mbm";
+					is_existinpath("bmconv", romutl::DIE_NOT_FOUND);
-				    my $bmconv_status = $?;
+my $rom_mbm_tmp = $rom_mbm;
+my $mbm_tmp = $mbm;
+if ($^O =~ /^MSWIN32$/i){
+$mbm_tmp =~ s-\/-\\-g;
+$rom_mbm_tmp =~ s-\/-\\-g;
+}
+				    system "bmconv -q -r $rom_mbm_tmp -m$mbm_tmp";
+	  		    my $bmconv_status = $?;
 				    die "* bmconv failed\n" if ($bmconv_status != 0 || !-f $rom_mbm);
 			    }
 				$line = "data=\"$rom_mbm\"\t\"$dest\"\n";
 				push @tempfiles, $rom_mbm;
 			}
 		#
 		# if file is a compressed ROM image file
 		elsif ($line =~ /^\s*compressed-bitmap=\s*"?(\S+)"?\s+"?(\S+)"?/i)
 		{
 			my $mbm = $1;
 			my $dest = $2;
 			my $cmprssd_rom_mbm = "$1_rom";
 			if ($is_xip eq 0)
 			{
 				# non-XIP rom - just include the mbm file
 				$line = "data=\"$mbm\"\t\"$dest\"\n";
 			}
 			else
 			{
 				if (! -e $cmprssd_rom_mbm || -M $cmprssd_rom_mbm >= -M $mbm)
 			    {
-				    system "bmconv /q /s $cmprssd_rom_mbm /m$mbm";
+					is_existinpath("bmconv", romutl::DIE_NOT_FOUND);
+my $cmprssd_rom_mbm_tmp = $cmprssd_rom_mbm;
+my $mbm_tmp = $mbm;
+if ($^O =~ /^MSWIN32$/i){
+$mbm_tmp =~ s-\/-\\-g;
+$cmprssd_rom_mbm_tmp =~ s-\/-\\-g;
+}
+				    system "bmconv -q -s $cmprssd_rom_mbm_tmp -m$mbm_tmp";
 				    my $bmconv_status = $?;
 				    die "* bmconv failed\n" if ($bmconv_status != 0 || !-f $cmprssd_rom_mbm);
 				}
 				$line = "data=\"$cmprssd_rom_mbm\"\t\"$dest\"\n";
 				push @tempfiles, $cmprssd_rom_mbm;
 	# data=\epoc32\wins\C\System\Alarms\churchbell.snd    "System\Alarms\Church bell"
 	# file[0x07060001]=\epoc32\release\MAWD\urel\cAkyb1.dll          System\Libs\EKeyb.dll
 	# file=\epoc32\release\marm\urel\eikcore.dll 			System\Libs\Eikcore.dll
 	# alias \System\Bin\DRTRVCT2_2.dll 			\System\Bin\DRTRVCT2_1.dll
 	#
+	$line =~ s-\\-\/-g;
 	if ($line =~ /^\s*TIME\s*=\s*/i)
 	{
 		return $line;
 	}
 	elsif($line =~ /^\s*volume\s*=.*/i)
 	}
 	elsif($line =~ /^\s*kerneltrace\s*=.*/i)
 	{
 		return $line;
 	}
-	if ($line =~ /^\s*(\S+)\s*=\s*(\S+)\s+"\\?(.*)"(.*)$/)
+	elsif($line =~ /^\s*dir\s*=.*/i)
+	{
+		return $line;
+	}
+	elsif($line =~ /^\s*bootbinary\s*=(.*)/i)
+	{
+	}
+	if ($line =~ /^\s*(\S+)\s*=\s*(\S+)\s+"\/?(.*)"(.*)$/)
 	{
 		$type = $1;
 		$variant = "";
 		$pcfile = $2;
 		$romfile = $3;
 		$tail = $4;
 	}
-	elsif ($line =~ /^\s*(\S+)(\[\S+\])\s*=\s*(\S+)\s+\\?(\S+)(.*)$/)
+	elsif ($line =~ /^\s*(\S+)(\[\S+\])\s*=\s*(\S+)\s+\/?(\S+)(.*)$/)
 	{
 		$type = $1;
 		$variant = $2;
 		$pcfile = $3;
 		$romfile = $4;
 		$tail = $5;
 	}
-	elsif ($line =~ /(\S+)\s*=\s*"([^"]+)"\s+"\\?(.*)"(.*)$/)
+	elsif ($line =~ /(\S+)\s*=\s*"([^"]+)"\s+"\/?(.*)"(.*)$/
+			|| $line =~ /(\S+)\s*=\s*"([^"]+)"\s+\/?(\S+)(.*)$/)
 	{
 		if ($line !~ /^REM MISSING/i)
 		{
 			$type = $1;
 			$variant = "";
 		}
 		else{
 			return $line;
 		}
 	}
-	elsif ($line =~ /^\s*(\S+)\s*=\s*(\S+)\s+\\?(\S+)(.*)$/)
+	elsif ($line =~ /^\s*(\S+)\s*=\s*(\S+)\s+\/?(\S+)(.*)$/)
 	{
 		$type = $1;
 		$variant = "";
 		$pcfile = $2;
 		$romfile = $3;
 		if ($enforceSysBin)
 		{
 			if ($DllDataMap{$patchdlldatamap_key}->{dstpath} !~ /^sys\\bin/i
 			 && $DllDataMap{$patchdlldatamap_key}->{dstpath} !~ /^sys\/bin/i)
 			{
-				$DllDataMap{$patchdlldatamap_key}->{dstpath} = "sys\\bin";
+				$DllDataMap{$patchdlldatamap_key}->{dstpath} = "sys\/bin";
 			}
 		}
-		my $dllfile = $DllDataMap{$patchdlldatamap_key}->{dstpath} . "\\". $romfilename;
+		my $dllfile = $DllDataMap{$patchdlldatamap_key}->{dstpath} . "\/". $romfilename;
 		$line = "$1  ";
 		$line .= "$dllfile ";
 		# Convert value into decimal (used to be done in AddDllDataInfo, but that limited us to
 		$line .= "$scalarSize $value\n";
 		return $line;
 	}
-	elsif ($line =~ /^\s*(\S+)\s*(\S+)\s+\\?(\S+)(.*)$/)
+	elsif ($line =~ /^\s*(\S+)\s*(\S+)\s+\/?(\S+)(.*)$/)
 	{
 		$type = $1;
 		$variant = "";
 		$pcfile = $2;
 		$romfile = $3;
 	# Buildrom should generate warning when destination path provided for a file
 	# is not a standard path(as per platsec) and "PlatSecEnforceSysBin" is turned off.
 	my $warnFlag = 1;
 	my $mustBeSysBin = $enforceSysBin;
 	if ($type =~ /^(data|compress|nocompress)$/i
-		&& $romfile !~ /^system\\(bin|libs|programs)\\/i)
+		&& $romfile !~ /^system\/(bin|libs|programs)\//i)
 	{
 		$mustBeSysBin = 0;
 		$warnFlag = 0;
 	}
 			# for multilinguify 'alias'es (generally resource files) 'MustBeSysBin' should not be enforced.
 			if(defined($multiLinguifyAlias{$pcfile})) {
 				return $line;
 			}
-			my $filename = "\\$romfile";	# in case no path is specified
+			my $filename = "\/$romfile";	# in case no path is specified
-			$filename = substr $filename, rindex($filename, "\\");
+			$filename = substr $filename, rindex($filename, "\/");
-			$romfile = "sys\\bin".$filename;
+			$romfile = "sys\/bin".$filename;
 			if ($pcfile !~ /^sys\\bin\\/i
 			    && $pcfile !~ /^sys\/bin/i)
 			{
-				my $pcfilename = "\\$pcfile";	# in case no path is specified
+				my $pcfilename = "\/$pcfile";	# in case no path is specified
-				$pcfilename = substr $pcfilename, rindex($pcfilename, "\\");
+				$pcfilename = substr $pcfilename, rindex($pcfilename, "\/");
-				$pcfile = "sys\\bin".$pcfilename;
+				$pcfile = "sys\/bin".$pcfilename;
 			}
 			return "$type$variant $pcfile \t$romfile$tail\n";
 		}
 		if ($romfile !~ /^sys\\bin\\/i
 		    && $romfile !~ /^sys\/bin/i)
 		{
-			my $filename = "\\$romfile";	# in case no path is specified
+			my $filename = "\/$romfile";	# in case no path is specified
-			$filename = substr $filename, rindex($filename, "\\");
+			$filename = substr $filename, rindex($filename, "\/");
-			$romfile = "sys\\bin".$filename;
+			$romfile = "sys\/bin".$filename;
 		}
 	}
 	else
 	{
 		if ($warnFlag && $romfile !~ /^sys\\bin\\/i && $romfile !~ /^sys\/bin/i)
 	my $skippingBlanks=0;
 	undef @newobydata;
 if($opt_v)
 {
-	  my $logWin = "logwin.oby";
+	  my $logWin = $thisdir."logwin.oby";
-	  my $logLinux = "loglinux.oby";
+	  my $logLinux = $thisdir."loglinux.oby";
 	  unlink($logWin);
 	  unlink($logLinux);
 	  open LOGWIN, ">$logWin" or die("* Can't create $logWin\n");
 	  open LOGLINUX, ">$logLinux" or die("* Can't create $logLinux\n");
 }
 			$skippingBlanks=0;
 		}
 		#
 		# Track ROMNAME, allowing overrides
 		#
-		if ($line=~/romname\s*=\s*"?(\S+)\.(\S+)"?\s*/i)
+		if ($line=~/romname\s*[=\s]\s*"?(\S+)\.(\S+)"?\s*/i)
 		{
 			if ($romname ne "" && $opt_o eq "")
 			{
 				print_source_error("Overrides previous ROM name $romname");
 			}
 			$rombasename = $1;
 			$romname = "$1.$2";
+			if ($opt_workdir)
+			{
+				$rombasename = $thisdir.$rombasename;
+				$romname = $thisdir.$romname;
+			}
 			next;
 		}
 		#
 		# ROM directory listing
 		#
 	    if( ($newline !~ /^\s*TIME\s*=\s*/i)
 	      &&($newline !~ /^\s*volume\s*=.*/i)
 	      &&($newline !~ /^\s*kerneltrace\s*=.*/i))
 	    {
 	        my $tmpline = $newline;
-	        if($^O =~ /^MSWin32$/i)
+	        if(&is_windows)
 	        {
 	          $newline =~ s-\/-\\-go;
 	          if($opt_v)
 	          {
 print LOGWIN $newline;
 	  close LOGWIN;
 	  close LOGLINUX;
 	}
 	exit(1) if($errors && $strict);
 	# Handle ROMNAME and possible -o override
 	if ($opt_o ne "")
 	{
+		if ($opt_workdir && $opt_o !~ /^[\\\/]/ && $opt_o !~ /^.:/)
+		{
+			$opt_o = $thisdir.$opt_o;
+		}
+		if (&is_windows)
+		{
+			$opt_o =~ s-\/-\\-g;
+		}else
+		{
+			$opt_o =~ s-\\-\/-g;
+		}
 		$romname=$opt_o;
 		if ($opt_o=~/(\S+)\.(\S+)/)
 		{
 			$rombasename=$1;
 		}
 		# write data drive oby file.
 		elsif ($line =~ /^\s*REM DATA_IMAGE\[(\d+)\]\s+(.*)$/i)
 		{
 				my $dataimageidx=$1;
 				close DUMPFILE;
+				my $name = $datadriveimage[$dataimageidx]{name};
+				if ($name !~ /^.:/ && $name !~ /^[\\\/]/)
+				{
+					$datadriveimage[$dataimageidx]{name} = $thisdir.$name;
+				}
 				$dumpfile="$datadriveimage[$dataimageidx]{name}";
 				$datadriveimage[$dataimageidx]{obeyfile}=$dumpfile;
 				$dumpfile .= ".oby";
 				open DUMPFILE, ">$dumpfile" or die("* Can't create $dumpfile\n");
 				print "* Writing $dumpfile - intermediate OBY file\n";
 		my $file;
 		my $prevdir = "";
 		foreach $file (sort {uc($a) cmp uc($b)} keys %romfiles)
 		{
-			my $dir = substr $file,0,rindex($file, "\\");
+			my $dir = substr $file,0,rindex($file, "\/");
 			if (uc $dir ne uc $prevdir)
 			{
 				$prevdir = $dir;
 				print DIRFILE "\n";
 			}
 #
 sub run_rombuilder
 {
 	my ($command, $obeyfile, $logfile) = @_;
-	$command .= " $obeyfile.oby";
+	$command .= " -logfile=$logfile $obeyfile.oby";
 	#CR1258 test cases are depending on the following output.
 	print "* Executing $command\n" if ($opt_v);
 	open DATA, "$command 2>&1 |"   or die "Couldn't execute command: $command";
 	while ( defined( my $line = <DATA> ) ) {
 	}
 	else
 	{
 		$rom_compression_type = "";
 	}
+	#Compose command line options for Cache.
+	my $cache_options;
+	if($opt_cache == 1)
+	{
+		$cache_options = "-cache ";
+	}
+	if($opt_nocache == 1)
+	{
+		$cache_options .= "-nocache ";
+	}
+	if($opt_cleancache == 1)
+	{
+		$cache_options .= "-cleancache";
+	}
 	my $rombuild;
 	if(!$geninc)
 	{
-		$rombuild = "rombuild -slog $rom_compression_type $logLevel $lowMem $opt_fastcompress $opt_jobs";
+		$rombuild = "rombuild -slog $rom_compression_type $logLevel $lowMem $opt_jobs";
 	}
 	else
 	{
-		$rombuild = "rombuild -slog $rom_compression_type -geninc $logLevel $lowMem $opt_fastcompress $opt_jobs";
+		$rombuild = "rombuild -slog $rom_compression_type -geninc $logLevel $lowMem $opt_jobs";
 	}
 	if($gendep)
 	{
 		$rombuild .= " -gendep";
 	}
-	my $rofsbuild = "rofsbuild -slog $logLevel $lowMem $opt_fastcompress $opt_jobs";
+	$rombuild .= " -k" if($opt_k);
+	my $rofsbuild = "rofsbuild -slog $logLevel $lowMem $opt_jobs $cache_options";
 	foreach my $arg (keys %rombuildOptions)
 	{
 		$rombuild .= " $arg";
 	}
+	$rofsbuild .= " -k" if($opt_k);
 	for (my $romidx=0; $romidx<8; $romidx++)
 	{
 		my $obeyfile=$romimage[$romidx]{obeyfile};
 		my $xip=$romimage[$romidx]{xip};
 		my $compress=$romimage[$romidx]{compress};
 				$compress =~m/\s-(compression)(method)\s(none|inflate|bytepair)/;
 				print "* ".$1." ".$2.": ".$3;
 			}
 			if ($xip)
 			{
-				run_rombuilder($rombuild.$compress, $obeyfile, "ROMBUILD.LOG");
+				is_existinpath("rombuild", romutl::DIE_NOT_FOUND);
-				if(!$nosymbols){
+				$rombuild .= " -symbols" unless($nosymbols) ;
-				print "* Writing $obeyfile.symbol - ROM symbol file\n";
+				run_rombuilder($rombuild.$compress, $obeyfile, $thisdir."ROMBUILD.LOG");
-				print "* Executing maksym $obeyfile.log $obeyfile.symbol\n" if ($opt_v);
-				system("maksym $obeyfile.log $obeyfile.symbol >maksym.out");
-				exit(1) if (!-e "$obeyfile.symbol");
-				}
 			}
 			else
 			{
 				# efficient_rom_paging.pm can move everything to core rom.
 				# If that is the case, don't run rofsbuild at all to avoid errors.
-				use constant TRUE => 1;
+			#	use constant TRUE => 1;
-				use constant FALSE => 0;
+			#	use constant FALSE => 0;
-				my $run_rofs_build = FALSE;
+				my $run_rofs_build = 0;
 				open OBYFILE, "$obeyfile.oby";
 				for (<OBYFILE>)
 				{
 					if (is_oby_statement($_))
 					{
-						$run_rofs_build = TRUE;
+						$run_rofs_build = 1;
 						last;
 					}
 				}
 				close OBYFILE;
 				if ($run_rofs_build)
 				{
-					run_rombuilder($rofsbuild.$compress, $obeyfile, "ROFSBUILD.LOG");
+					is_existinpath("rofsbuild", romutl::DIE_NOT_FOUND);
-					if(!$nosymbols){
+					if(!$nosymbols)
-					print "* Writing $obeyfile.symbol - ROFS symbol file\n";
+					{
-					print "* Executing maksymrofs $obeyfile.log $obeyfile.symbol\n" if ($opt_v);
+						$rofsbuild .= " -symbols";
-					system("maksymrofs $obeyfile.log $obeyfile.symbol >maksym.out");
-					exit(1) if (!-e "$obeyfile.symbol" );
 					}
+					run_rombuilder($rofsbuild.$compress, $obeyfile, $thisdir."ROFSBUILD.LOG");
 				}
 			}
 			unlink "rombuild.log";
 			unlink "maksym.out";
 		}
 #
 sub relative_path
 {
 my ($arg) = @_;
-return $arg if ($arg !~ /^\\/);	# not an absolute path
+return $arg if ($arg !~ /^\//);	# not an absolute path
 if ($uppath eq "x")
 	{
 		$uppath=cwd;
-		$uppath=~s-/-\\-go;		    # separator from Perl 5.005_02+ is forward slash
+		$uppath=~s-\\-\/-go;		    # separator from Perl 5.005_02+ is forward slash
-		$uppath=~s-^(.*[^\\])$-$1\\-o;	    # ensure path ends with a backslash
+		$uppath=~s-^(.*[^\/])$-$1\/-o;	    # ensure path ends with a backslash
-		$uppath=~s-\\([^\\]+)-\\..-og;	    # convert directories into ..
+		$uppath=~s-\/([^\/]+)-\/..-og;	    # convert directories into ..
-		$uppath=~s-^.:\\--o;		    # remove drive letter and leading backslash
+		$uppath=~s-^.:\/--o;		    # remove drive letter and leading backslash
 	}
-$arg=~s-^\\--o;	# remove leading backslash from original path
+$arg=~s-^\/--o;	# remove leading backslash from original path
 return "$uppath$arg";
 }
 # Returns the global @obydata reference to support external tool invocation.
 sub getOBYDataRef{
 		my $aDllFile = $DllMapRef->{srcfile};
 		my $SymbolCount = scalar ( keys %{$DllMapRef}) - 2; #The map has 'srcfile' and 'dstpath' special keys besides the symbols.
 		my $DllSymMapRef;
-		my @BPABIPlats = &BPABIutl_Plat_List;
+		my @BPABIPlats = &get_bpabiplatlist;
 		my $matchedSymbols = 0;
 		my $globalSyms = 0;
-		my @platlist = &Plat_List();
+		my @platlist = &get_platlist;
 		my $platName;
 		my $rootPlatName;
-		my $plat = "ARMV5";
+		my $plat = "armv5";
-		$plat = &Variant_GetMacro() ? $plat."_ABIV1" : $plat."_ABIV2";
+		$plat = &get_abiv2mode() ? $plat."_abiv1" : $plat."_abiv2";
 		foreach my $plat(@platlist)
 		{
-			if(($aDllFile =~ /\\($plat)\\/i) or ($aDllFile =~ /\\($plat\.\w+)\\/i ))
+			if(($aDllFile =~ /[\/\\]($plat)[\/\\]/i) or ($aDllFile =~ /[\/\\]($plat\.\w+)[\/\\]/i ))
 			{
 				$platName = $1;
 				last;
 			}
 		}
-		$rootPlatName =	&Plat_Customizes($platName) ? &Plat_Root($platName) : $platName;
+		$rootPlatName =	&get_platcustomizes($platName) ? &get_platroot($platName) : $platName;
 		# Map files will be referred for all ARM platforms,
 		# and for BSF platforms which cutomizes ARM platforms.
-		if($rootPlatName =~ /^ARMV5|$plat$/i){
+		if($rootPlatName =~ /^armv5|$plat$/i){
 			my $mapfile = "${aDllFile}.map";
 			open MAPFILE, "$mapfile" or die "Can't open $mapfile\n";
 			while(<MAPFILE>){
 			my $line = $_;
 					# Record the address and the size of the symbol.
 					$DllSymMapRef->{dataAddr} = $symbolValue;
 					$DllSymMapRef->{size} = $symbolSz;
 					$matchedSymbols++;
 					if( $matchedSymbols >= $SymbolCount){
 						last;
 					}
 				}
 				$errors++ if($strict);
 				next; #go to the next patch dll data statement
 			}
 			if( $aDllFile =~ /(.*)\.[^.]+$/ ){
 				my $proxydsofile = "$1.dso";
-				$proxydsofile =~ s/$abiDir\\(.*)\\/ARMV5\\LIB\\/ig;
+				$proxydsofile =~ s-$abiDir\/(.*)\/-armv5\/lib\/-ig;
 				open PIPE, "getexports -d $proxydsofile|" or die "Can't open file $proxydsofile\n";
 				while (<PIPE>){
 					my $line = $_;
 					if($line =~ /\s*(\S+)\s+(\d+)\s+((\S+)\s+(\d+))?/){
 						my $symbol = $1;
 # absolute paths starting with slashes.
 sub addDrivesToFeatureVariantPaths
 {
 	return unless $featureVariant{'VALID'};
-	my $current = cwd();
+	my $current = &get_epocdrive;
 	my $drive = $1 if ($current =~ /^(.:)/);
 	# pre-include file
 	my $HRH = $featureVariant{'VARIANT_HRH'};
 	$featureVariant{'VARIANT_HRH'} = $drive . $HRH if ($HRH =~ /^[\\\/]/);
 {
 	if($needSmrImage)
 	{
 		foreach my $oby (@obeyFileList)
 		{
+			is_existinpath("rofsbuild", romutl::ERROR_NOT_FOUND);
 			my $command = "rofsbuild -slog -smr=$oby.oby";
 			print "* Executing $command\n" if($opt_v);
 			system($command);
 			if($? != 0)
 			{
 	{
 		print "\n SMR image creating error for empty image name!\n";
 	}
 }
+sub getWorkdir
+{
+	return $thisdir;
+}
+sub find_stdcpp
+{
+return "cpp" if (!$stdcpp);
+return "cpp" if (&is_linux);
+my $delimiter = &env_delimiter;
+		$ENV{PATH}="${epocroot}epoc32\/gcc_mingw\/bin$delimiter".$ENV{PATH};
+my @paths;
+		@paths = split(/$delimiter/, $ENV{PATH});
+unshift @paths, "\.";
+foreach my $path (@paths)
+{
+next if ($path =~ /^\s*$/);
+chomp $path;
+$path =~ s/\\/\//g;
+$path .= "\/" unless ($path =~ /\/$/);
+$path = $path."cpp.exe";
+if (-e $path)
+{
+		        $path = "\"$path\"";
+		my $command = "$path --version 2>&1";
+						open DATA, "$command |"   or die "Couldn't execute command: $command\n";
+						my $line = <DATA>;
+						chomp($line);
+						print "$line\n" if($opt_v);
+						if ($line =~ /cpp\.exe \(GCC\) .* \(mingw special\)/)
+						{
+							print "found stdcpp in $path\n" if($opt_v);
+							close DATA;
+							return $path;
+						}
+						close DATA;
+}
+}
+die "Error: Cannot found standard cpp.exe in the PATH.\n";
+}
+sub checkcase()
+{
+	if (&is_windows)
+	{
+		my @checkcase_obydatatemp = @obydata;
+		# call the phase without external tools.
+		plugin_phase();
+		multlinguify_phase();
+		#spi_creation_phase(); #spi creation phase will delete some lines, so do not call this phase
+		suppress_phase();
+		process_dlldata();
+		bitmap_aif_converison_phase();
+		my $checkcase_log = "checkcase.log";
+		unlink $checkcase_log;
+		open CHECKCASELOG, ">$checkcase_log" or die("* Can't create $checkcase_log\n");
+		my @checkcase_lines = @obydata;
+		my %checkcase_macro;
+		my @checkcase_macrodir;
+		my $checkcase_line;
+		print CHECKCASELOG "======================Macro check part:======================\n";
+		foreach $checkcase_line (@checkcase_lines)
+		{
+			track_source($checkcase_line);
+			$checkcase_line =~ s-\/-\\-g;
+			$checkcase_line =~ s-\\\\-\\-g;
+			if ($checkcase_line =~ /^\s*REM\s*(re)?defined\s*(\w*)\s*as\s*(\S+)/)
+			{
+				my $checkcase_macrocontent = $3;
+				my $checkcase_macroname = $2;
+				if ($checkcase_macrocontent =~ /[a-zA-Z]/)
+				{
+					$checkcase_macro{$checkcase_macroname} = $checkcase_macrocontent;
+					checkcase_macro(\@checkcase_macrodir, $checkcase_macroname, $checkcase_macrocontent);
+				}
+			}
+		}
+		print CHECKCASELOG "======================Macro check part end======================\n\n";
+		print CHECKCASELOG "======================File check part:======================\n";
+		foreach $checkcase_line (@checkcase_lines)
+		{
+			if ($checkcase_line =~ /^\s*REM\s*.*/)
+			{
+				next;
+			}
+			if ($checkcase_line =~ /^\s*#\s*\d+\s*\"(\S+)\"\s*\d*\s*$/) #oby filename
+			{
+				my $checkcase_whichfile = $1;
+				checkcase_obyfilename($checkcase_whichfile);
+				track_source($checkcase_line);
+			}elsif ($checkcase_line =~ /^\s*\S+\s*=\s*"([^"]+)"\s+\S*\s*/
+					 || $checkcase_line =~ /^\s*\S+\s*=\s*(\S+)\s+\S*\s*/) #oby content file name
+			{
+				my $checkcase_pcsidefile = $1;
+				checkcase_pcsidefilename(\@checkcase_macrodir, $checkcase_pcsidefile);
+			}
+		}
+		print CHECKCASELOG "======================File check part end======================\n";
+		close CHECKCASELOG;
+		@obydata = @checkcase_obydatatemp;
+	}else
+	{
+		print "WARNING: checkcase option is only valid on windows.\n";
+	}
+}
+sub checkcase_macro()
+{
+	my $macrodir = shift;
+	my $name = shift;
+	my $content = shift;
+	if ($content =~ /epoc32/i && (-d $content))
+	{
+		my $realdir = `directory.bat $content`;
+		$realdir =~ s/\s+$//g;
+		$realdir =~ s/^\s*\w://g if ($content !~ /^\w:/);
+		$realdir =~ s/\\$//g if ($content !~ /\\$/);
+		$realdir .= "\\" if ($content =~ /\\$/ && $realdir !~ /\\$/);
+		$sourcefile =~ s/\//\\/g;
+		$sourcefile =~ s/\\\\/\\/g;
+		if ($realdir ne $content)
+		{
+			print CHECKCASELOG "check case: macro name is $name\n";
+			print CHECKCASELOG "WARNING: macro case is not equal to real.\n";
+			print CHECKCASELOG "file name is $sourcefile\n";
+			print CHECKCASELOG "current is $content\n";
+			print CHECKCASELOG "expect  is $realdir\n\n";
+			checkcase_convert($sourcefile, $content, $realdir);
+		}
+		$content =~ s-\\-\\\\-g;
+		push @$macrodir, $content;
+	}else
+	{
+		if($name eq "PLATFORM_NAME")
+		{
+			$content =~ s-\\-\\\\-g;
+			$content =~ s-\.-\\\.-g;
+			$checkcase_platform = $content;
+		}
+	}
+}
+sub checkcase_obyfilename()
+{
+	my $checkfile = shift;
+	if (-e $checkfile)
+	{
+		while ($checkfile=~s-[\\](?!\.{2}\\)[^\\]*\\\.{2}(?=\\)--go){};
+		$sourcefile =~ s/\//\\/g;
+		if ($checkfile eq $sourcefile)
+		{
+			return;
+		}
+		my($filename, $dir, $suffix) = fileparse($checkfile);
+		my $realdir = `directory.bat $dir`;
+		$realdir =~ s/\s+$//g;
+		$realdir .= "\\" if ($realdir !~ /\\$/);
+		if ($realdir ne $dir)
+		{
+			print CHECKCASELOG "check case: oby file name is $checkfile\n";
+			print CHECKCASELOG "WARNING: dir case is not equal to real.\n";
+			my $tempsrcfile = $sourcefile;
+			$tempsrcfile =~ s/\\\\/\\/g;
+			print CHECKCASELOG "file name is $tempsrcfile\n";
+			print CHECKCASELOG "current is $dir\n";
+			print CHECKCASELOG "expect  is $realdir\n\n";
+			checkcase_convert($sourcefile, $dir, $realdir);
+		}
+		my $currentdir = cwd;
+		chdir "$dir";
+		my @realfile = `dir "$filename" 2>&1`;
+		my $line;
+		foreach $line (@realfile)
+		{
+			if ($line =~ /^\s*(\S+)\s+(\d{2}:\d{2})\s+(PM|AM)?\s+([\d\,])+\s+([\S]+)\s*/)
+			{
+				my $realfilename = $5;
+				my $filetemp = lc $filename;
+				my $realtemp = lc $realfilename;
+				if ($filetemp eq $realtemp && $realfilename ne $filename)
+				{
+					print CHECKCASELOG "check case: oby file name is $checkfile\n";
+					print CHECKCASELOG "WARNING: filename case is not equal to real.\n";
+					my $tempsrcfile = $sourcefile;
+					$tempsrcfile =~ s/\\\\/\\/g;
+					print CHECKCASELOG "file name is $tempsrcfile\n";
+					print CHECKCASELOG "current is $filename\n";
+					print CHECKCASELOG "expect  is $realfilename\n\n";
+					checkcase_convert($sourcefile, $filename, $realfilename);
+				}
+			}
+		}
+		chdir "$currentdir";
+	}
+}
+sub checkcase_pcsidefilename()
+{
+	my $macrodirs = shift;
+	my $checkfile = shift;
+	$checkfile =~ s/^\"//g;
+	$checkfile =~ s/\"$//g;
+	if (-e $checkfile)
+	{
+		while ($checkfile=~s-[\\](?!\.{2}\\)[^\\]*\\\.{2}(?=\\)--go){};
+		$sourcefile =~ s/\//\\/g;
+		my($filename, $dir, $suffix) = fileparse($checkfile);
+		if ($dir eq "\.\\")
+		{
+			$dir = cwd;
+			$dir =~ s/\//\\/g;
+			$dir .= "\\" if ($dir !~ /\\$/);
+		}
+		my $realdir = `directory.bat $dir`;
+		$realdir =~ s/\s+$//g;
+		$realdir =~ s/^\s*\w://g if ($dir !~ /^\w:/);
+		$realdir .= "\\" if ($realdir !~ /\\$/);
+		my $dirtemp = $dir;
+		if ($checkcase_test)
+		{
+			my $macrodirtemp = "";
+			foreach my $macrodir (@$macrodirs)
+			{
+				if ($dirtemp =~ /^$macrodir(.*)$/)
+				{
+					$macrodirtemp = $macrodir if (length($macrodirtemp) < length($macrodir));
+				}
+			}
+			if ($macrodirtemp ne "")
+			{
+				$dirtemp =~ s/^$macrodirtemp//g;
+				$realdir =~ s/^$macrodirtemp//ig;
+			}
+		}
+		if ($realdir ne $dirtemp)
+		{
+			print CHECKCASELOG "check case: pc side file name is $checkfile\n";
+			print CHECKCASELOG "WARNING: dir case is not equal to real.\n";
+			my $tempsrcfile = $sourcefile;
+			$tempsrcfile =~ s/\\\\/\\/g;
+			print CHECKCASELOG "file name is $tempsrcfile\n";
+			print CHECKCASELOG "current is $dirtemp\n";
+			print CHECKCASELOG "expect  is $realdir\n\n";
+			checkcase_convert($sourcefile, $dirtemp, $realdir);
+		}
+		my $currentdir = cwd;
+		chdir "$dir";
+		my @realfile = `dir "$filename" 2>&1`;
+		my $line;
+		foreach $line (@realfile)
+		{
+			if ($line =~ /^\s*(\S+)\s+(\d{2}:\d{2})\s+(PM|AM)?\s+([\d\,])+\s+(.+)\s*/)
+			{
+				my $realfilename = $5;
+				my $filetemp = lc $filename;
+				my $realtemp = lc $realfilename;
+				if ($filetemp eq $realtemp && $realfilename ne $filename)
+				{
+					print CHECKCASELOG "check case: pc side file name is $checkfile\n";
+					print CHECKCASELOG "WARNING: filename case is not equal to real.\n";
+					my $tempsrcfile = $sourcefile;
+					$tempsrcfile =~ s/\\\\/\\/g;
+					print CHECKCASELOG "file name is $tempsrcfile\n";
+					print CHECKCASELOG "current is $filename\n";
+					print CHECKCASELOG "expect  is $realfilename\n\n";
+					checkcase_convert($sourcefile, $filename, $realfilename);
+				}
+			}
+		}
+		chdir "$currentdir";
+	}
+}
+sub checkcase_convert()
+{
+	return if (!$checkcase_test);
+	my $file = shift;
+	my $origin = shift;
+	my $real = shift;
+	my @realfile = `dir "$file"  2>&1`;
+	my $line;
+	foreach $line (@realfile)
+	{
+		if ($line =~ /^\s*(\S+)\s+(\d{2}:\d{2})\s+(PM|AM)?\s+([\d\,])+\s+([\S]+)\s*/)
+		{
+			my $realfilename = $5;
+			$realfilename =~ s-\.-\\\.-g;
+			$file =~ s-$realfilename$--ig;
+			$realfilename =~ s-\\\.-\.-g;
+			$file .= $realfilename;
+		}
+	}
+	my $tempfile = $file.".temp";
+	my $usemultimacro = 0;
+	my $uses60macro_aifrsc = 0;
+	my $uses60macro_exe = 0;
+	my $uses60macro_aificon = 0;
+	my $uses60macro_resource = 0;
+	my $originwithoutext = $origin;
+	my $realwithoutext = $real;
+	if ($origin =~ /epoc32/i)
+	{
+		my $tempepocroot = $ENV{EPOCROOT};
+		$tempepocroot =~ s-\\-\\\\-g;
+		$origin =~ s/^$tempepocroot//g;
+		$real =~ s/^$tempepocroot//g;
+	}elsif ($checkcase_platform ne "" && $origin =~ /^_$checkcase_platform\_(.*)/)
+	{
+		$origin =~ s/^_$checkcase_platform\_/_PLATFORM_NAME_/g;
+		$real =~ s/^_$checkcase_platform\_/_PLATFORM_NAME_/g;
+	}elsif ($origin =~ /\S+\_reg\.rsc$/)
+	{
+		$originwithoutext =~ s/\_reg\.rsc$//g;
+		$realwithoutext =~ s/\_reg\.rsc$//ig;
+		$uses60macro_aifrsc = 1;
+	}elsif ($origin =~ /\S+\.rsc$/)
+	{
+		$originwithoutext =~ s/\.rsc$//g;
+		$realwithoutext =~ s/\.rsc$//ig;
+		$usemultimacro = 1;
+		$uses60macro_resource = 1;
+	}elsif ($origin =~ /\S+\.r01$/)
+	{
+		$originwithoutext =~ s/\.r01$//g;
+		$realwithoutext =~ s/\.r01$//ig;
+		$usemultimacro = 1;
+	}elsif ($origin =~ /\S+\.exe$/)
+	{
+		$originwithoutext =~ s/\.exe$//g;
+		$realwithoutext =~ s/\.exe$//ig;
+		$uses60macro_exe = 1;
+	}elsif ($origin =~ /\S+\_aif\.mif$/)
+	{
+		$originwithoutext =~ s/\_aif\.mif$//g;
+		$realwithoutext =~ s/\_aif\.mif$//ig;
+		$uses60macro_aificon = 1;
+	}elsif ($origin =~ /\S+\.mif$/)
+	{
+		$originwithoutext =~ s/\.mif$//g;
+		$realwithoutext =~ s/\.mif$//ig;
+		$uses60macro_aificon = 1;
+	}
+	$origin =~ s-\\-\\\\-g;
+	$origin =~ s-\.-\\\.-g;
+	open (SRC, "<$file");
+	open (DST, ">$tempfile");
+	my $line;
+	while($line = <SRC>)
+	{
+		my $flag = 0;
+		if ($line =~ /$origin/)
+		{
+			$originwithoutext = $origin;
+			$realwithoutext = $real;
+			$flag = 1;
+		}elsif ($usemultimacro)
+		{
+			if ($line =~ /^.*=\s*MULTI_LINGUIFY\s*\(.*$originwithoutext/)
+			{
+				$flag = 1;
+			}elsif ($line =~ /^\s*S60_APP_RESOURCE\s*\(\s*$originwithoutext\s*\)/ && $uses60macro_resource)
+			{
+				$flag = 1;
+			}
+		}elsif ($uses60macro_exe)
+		{
+			if ($line =~ /^\s*S60_APP_EXE\s*\(\s*$originwithoutext\s*\)/)
+			{
+				$flag = 1;
+			}
+		}elsif ($uses60macro_aificon)
+		{
+			if ($line =~ /^\s*S60_APP_AIF_ICONS\s*\(\s*$originwithoutext\s*\)/)
+			{
+				$flag = 1;
+			}elsif ($line =~ /^\s*SCALABLE_IMAGE\s*\(.*$originwithoutext\s*\)/)
+			{
+				$flag = 1;
+			}elsif ($line =~ /^\s*S60_APP_BITMAP\s*\(\s*$originwithoutext\s*\)/)
+			{
+				$flag = 1;
+			}
+		}elsif ($uses60macro_aifrsc)
+		{
+			if ($line =~ /^\s*S60_APP_AIF_RSC\s*\(\s*$originwithoutext\s*\)/)
+			{
+				$flag = 1;
+			}elsif ($line =~ /^\s*S60_UPGRADABLE_APP_REG_RSC\s*\(\s*$originwithoutext\s*\)/)
+			{
+				$flag = 1;
+			}
+		}
+		if ($flag)
+		{
+			print CHECKCASELOG "it has been converted automatically\n";
+			print CHECKCASELOG "original  line is $line";
+			$line =~ s-$originwithoutext-$realwithoutext-;
+			print CHECKCASELOG "converted line is $line\n";
+		}
+		print DST $line;
+	}
+	close SRC;
+	close DST;
+unlink "$file";
+rename ("$file.temp", "$file");
+}
 1;

changeset 629	541af5ee3ed9
parent 626	ac03b93ca9c4
child 633	a4eca1f021ac