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

equal deleted inserted replaced

-:122d2b873fd1
+:30b30f9da0b7
 use strict;
 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.
-use Pathutl;
 use Cwd;			# Module to provide functions for determining the pathname of the current working directory.
+use romutl;
+use romosvariant;
 # This fuction is used primiarly to check for whitespace in the location for "zdrive" / "datadrive" folder creation,
 # specified by the user, if yes then it returns one, else zero
 sub checkForWhiteSpace
 {
 {
 	my($dirName) = @_;
 	# get the working directory.
 	my $curWorkingDir = getcwd;
 	# substitute slash with double backward slash.
-	$curWorkingDir =~ s/\//\\/g;
+	$curWorkingDir =~ s/\\/\//g;
 	#if $curWorkingDir already has trailing '\', don't include it again
-	if( $curWorkingDir =~ /\\$/)
+	if( $curWorkingDir =~ /\/$/)
 	{
 		return $curWorkingDir.$dirName;
 	}
 	else
 	{
-		return $curWorkingDir."\\".$dirName;
+		return $curWorkingDir."\/".$dirName;
 	}
 }
 # create directory and copy respective file on to that directory.
 # is there is a problem while copying files from source to destination
 	$source =~ s/\"//g; # remove double quotes from the string.
 	my $destFileName = "";	# name of the destination file.
 	$dest =~ s/\"//g;	# remove double quotes from the string.
 	my $destDirectory = $dest;
 	# strip the last substring to get destination file
-	if ($dest=~/.*\\(\S+)/)
+	if ($dest=~/.*[\/\\](\S+)/)
 	{
 		$destFileName = $1;
 	}
 	else
 	{
 	}
 	else
 	{
 		$destDirectory =~ s/$destFileName//;
 	}
-	my $destfile = $dir."\\".$dest;
+	my $destfile = $dir."\/".$dest;
-	my $createdir = $dir."\\".$destDirectory ;
+	my $createdir = $dir."\/".$destDirectory ;
 	# create the specified directory.
 	&createDirectory($createdir);
 	if (!copy($source,$destfile))
 	{
 		return 0;
 	}
 	else
 	{
 		print "$source copied to $destfile\n" if($verboseOpt);
-		return $destfile;
+		return "\"".$destfile."\"";
 	}
 }
 # Make a check for sisfile keyword by reading the specified iby/oby file,
 # if sisfile keyword is found then push the respective image on to the respective array
 {
 	my($dir,$obyfile,$nonsisFileArray,$renameArray,$aliasArray,$hideArray,$verboseOpt,$keepgoingOpt) = @_;
 	open (OBEY ,$obyfile) or die($obyfile."\n");
 	while(my $line =<OBEY>)
 	{
-		if( $line =~ /^(file|data)\s*=\s*(\S+)\s+(\S+)/i )
+		if( $line =~ /^(file|data)\s*=\s*(\"[^"]+\")\s+(\"[^"]+\")/i ||
+				$line =~ /^(file|data)\s*=\s*(\"[^"]+\")\s+(\S+)/i ||
+				$line =~ /^(file|data)\s*=\s*(\S+)\s+(\"[^"]+\")/i ||
+				$line =~ /^(file|data)\s*=\s*(\S+)\s+(\S+)/i )
 		{
 			my $keyWord=$1;
 			my $source=$2;
 			my $dest=$3;
-			if( $source !~ /(\S+):(\S+)/ )
+			if( $source !~ /(\S+):([^"]+)/ )
 			{
-				$source = Path_Drive().$2;
+				$source = get_drive().$2;
 			}
 			my $var = &copyFilesToFolders( $source,$dest,$dir,$verboseOpt);
 			if($var)
 			{
-				$var = $keyWord."=".$var;
+				$line = $keyWord."=".$var."\t".$dest."\n";
-				$line =~ s/^(\S+)=(\S+)/$var/;
 				push(@$nonsisFileArray,$line);
 			}
 			else
 			{
 				exit(1)if(!$keepgoingOpt);
 	# default system drive letter is specified since interpretsis doesnt allow overloading of options unless default
 	# options are specified.
 	my $basicOption = "-d C: ";	# default system drive letter
 	my $command = "interpretsis ";
 	my $vOption = "-w info" if ($verboseOpt);
+	is_existinpath("interpretsis", romutl::DIE_NOT_FOUND);
 	# do a check if the path has a white space.
 	if( $dataDrivePath =~ m/ /)
 	{
 		$dataDrivePath = '"'.$dataDrivePath.'"';
 		for( my $i = 0; $i < $arraysize; $i++ )
 		{
 			$command .= $$interpretsisOptList[$i]." ";
 		}
 	}
 	print "* Executing $command\n" if ( $verboseOpt );
 	system ( $command );
 	if ($? != 0)
 	{
 # invoke the READIMAGE tool with appropriate parameters.
 sub invokeReadImage
 {
 	my($imageName,$loc,$verboseOpt,$logFile,$keepgoingOpt) = @_;
 	my $command = "readimage ";
+	is_existinpath("readimage", romutl::DIE_NOT_FOUND);
 	# check if log file has been supplied.
 	if(defined($logFile))
 	{
 		if( $logFile =~ m/ /)
 		{
 	# destination file.
 	my $linedestFile;
 	# get source file.
 	# strip first occurrence of back slash
-	$linesource =~ s/\\//;
+	$linesource =~ s/[\/\\]//;
 	# get source file.
-	if ($linesource =~ /.*\\(\S+)/ )
+	if ($linesource =~ /.*[\/\\](\S+)/ )
 	{
 		$linesourceFile = $1;
 	}
 	# get destination file.
-	if ($linedest =~ /.*\\(\S+)/ )
+	if ($linedest =~ /.*[\/\\](\S+)/ )
 	{
 		$linedestFile = $1;
 	}
 	# iterate trough all
 	foreach my $firstarrayEntry (@$firstarray)
 					{
 						my $nonsisEntryDest = $3;
 						# remove double quotes.
 						$nonsisEntryDest =~ s/\"//g;
 						my $nonsisEntryDestFile;
-						if ($nonsisEntryDest =~ /.*\\(\S+)/ )
+						if ($nonsisEntryDest =~ /.*[\/\\](\S+)/ )
 						{
 							$nonsisEntryDestFile = $1;
 						}
 						if( $nonsisEntryDest eq $linesource )
 						{
 						{
 							my $newLineKeyword = $1;
 							my $newLinesource = $2;
 							my $newLinedest = $3;
 							$newLinedest =~ s/\"//g;
-							$newLinedest = "\\".$newLinedest;
+							$newLinedest = "\/".$newLinedest;
 							if( $newLinedest eq $lineToSearch )
 							{
 								# remove the specified element from the array.
 								splice(@$nonsisFileArray,$nonsisFileListCount,1);
 							}
 		#skip, parent directory and current directory.
 		next if ($entry eq "." || $entry eq "..");
 		#check if it is a file
 		if( -f $entry )
 		{
-			my $sourcedir = $rootdir."\\".$folderList.$entry;
+			my $sourcedir = $rootdir."\/".$folderList.$entry;
 			my $destdir	= "$folderList".$entry;
 			my $sisSource;
 			my $sisdestination;
 			if(&checkRegCtlFiles($entry))
 			{
 			}
 		}
 		#else it's a directory
 		else
 		{
-			&TraverseDir($entry,$folderList.$entry."\\",$sisFileContent,$rootdir);
+			&TraverseDir($entry,$folderList.$entry."\/",$sisFileContent,$rootdir);
 		}
 	}
 	closedir(DIR);
 	chdir("..");
 }
 	#get the array size.
 	my $arraySize = scalar(@$array);
 	for(my $i=0; $i<$arraySize ; $i++ )
 	{
 		#pop out the element to the respective obey file.
-		 print NEWDATA pop(@$array)."\n";
+		my $line=pop(@$array);
-	}
+		if (&is_windows){
-}
+			$line =~ s-\/-\\-g;
+		}else{
+			$line =~ s-\\-\/-g;
+		}
+		print NEWDATA $line."\n";
+	}
+}

changeset 606	30b30f9da0b7
parent 0	044383f39525
child 607	378360dbbdba