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

equal deleted inserted replaced

-:22486c9c7b15
+:378360dbbdba
 	$useinterpretsis = 0;
 }
 my $enforceFeatureManager = 0; # Flag to make Feature Manager mandatory if SYMBIAN_FEATURE_MANAGER macro is defined.
 my $BuildromMajorVersion = 3 ;
-my $BuildromMinorVersion = 24;
+my $BuildromMinorVersion = 26;
 my $BuildromPatchVersion = 0;
 sub print_usage
 {
 -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
--chechcase                       -- check character case of path/name in oby/iby files,
+-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.
 Popular -D defines to use include
 my $opt_cleancache = 0;
 my $thisdir=cwd;
 $thisdir=~s-\\-\/-go;		    # separator from Perl 5.005_02+ is forward slash
 $thisdir.= "\/" unless $thisdir =~ /\/$/;
-$thisdir=~s-^(.:)?\/--o;		    # remove drive letter and leading backslash
+$thisdir =~ s-\/-\\-g if (&is_windows);
 my $rominclude = $epocroot."epoc32\/rom\/include\/";
 $rominclude = &get_epocdrive().$rominclude unless $rominclude =~ /^.:/;
 $rominclude =~s-\\-\/-g;
 my $smrNoImageName = 0;
 my $onlysmrimage = 1;
 my $checkcase = 0;
 my $checkcase_platform = "";
 my $checkcase_test = 0;
-my $invokecmddir = "";
+my $opt_workdir = 0;
 sub match_obyfile
 {
 	my ($obyfile) = @_;
 	if (-f $obyfile)
 		return 1;
 	}
 	# search for the oby file in the list of include directories
 	my @otherDirs = ($rominclude);
-	push (@otherDirs, $invokecmddir) if ($invokecmddir ne "");
 	if ($featureVariant{'VALID'})
 	{
 		my $dirRef = $featureVariant{'ROM_INCLUDES'};
 	# first searching argList for keepgoing option
 	foreach my $arg (@argList) {
 		if ( $arg =~ /^-k$/i || $arg =~ /^-keepgoing$/i )
 	  {
 			$opt_k = 1;
-			next;
+		last;
-	  }elsif ($arg =~ /^-workdir=(.*)/)
-		{
-			my $workdir=$1;
-			if( $workdir =~ m/ / )
-			{
-				print "* Warning: $workdir contains whitespace, hence the files will be created in default location \n";
-				$workdir = "";
-			}
-			if ($workdir ne "")
-			{
-				$invokecmddir = cwd;
-				$invokecmddir=~s-\\-\/-go;		    # separator from Perl 5.005_02+ is forward slash
-				$invokecmddir.= "\/" unless $invokecmddir =~ /\/$/;
-				$workdir =~ s-\\-\/-g;
-				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 =~ /\/$/;
-				$thisdir=~s-^(.:)?\/--o;		    # remove drive letter and leading backslash
-			}
-			next;
 		}
 	}
 	foreach my $arg (@argList)
 	{
 	    if ($arg =~ /^-argfile=(.*)/)
 			$checkcase_test=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;
 		}
 if($arg =~/^-c(.*)/)
 {
 if($1 eq 'none' )
 # 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 \"$invokecmddir\"" if ($invokecmddir ne "");
+	}
-	}
+	print "* cpp -Wno-endif-labels -o $temp1OBYFile $cppargs\n" if ($opt_v);
-	print "* cpp -Wno-endif-labels -o tmp1.oby $cppargs\n" if ($opt_v);
 	is_existinpath("cpp", romutl::DIE_NOT_FOUND);
 	$errors = 0;
-	open CPP, "| cpp -Wno-endif-labels -o tmp1.oby $cppargs" or die "* Can't execute cpp";
+	open CPP, "| cpp -Wno-endif-labels -o $temp1OBYFile $cppargs" or die "* Can't execute cpp";
 	foreach my $arg (@obyfiles)
 	{
 		print CPP "\n#line 1 \"$arg\"\n";
 		if(open(OBY, $arg)) {
 			}
 		}
 	}
 	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);
 		$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
 			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;
+		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
 }
 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)
 			{
 				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;
 		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;
 # SBSv1 variant binary or invariant binary
 				  $fileExists = get_BVbinname($altFile, $varname);
 				}
 				last if $fileExists;
 			}
-			# for -workdir option, to support relative path to the call path
-			if (!$fileExists && ($invokecmddir ne "") && ($filename !~ /^([\\\/]|.:)/))
-			{
-				if (-e $invokecmddir.$filename)
-				{
-					$fileExists = $invokecmddir.$filename;
-				}
-			}
 			# 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)
 			{
 			{
 				# 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/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.
 	}
 	elsif($line =~ /^\s*kerneltrace\s*=.*/i)
 	{
 		return $line;
 	}
+	elsif($line =~ /^\s*dir\s*=.*/i)
+	{
+		return $line;
+	}
 	elsif($line =~ /^\s*bootbinary\s*=(.*)/i)
 	{
 	}
 	if ($line =~ /^\s*(\S+)\s*=\s*(\S+)\s+"\/?(.*)"(.*)$/)
 	{
 		$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 = "";
 	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
 		#
 	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;
 		}
 				$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;

changeset 607	378360dbbdba
parent 590	360bd6b35136
parent 606	30b30f9da0b7
child 609	f76e0f94b7ab