sbsv1_os/e32toolp/makmake/makmake.pl
branchRCL_3
changeset 21 91b3b8b5dbbc
parent 18 99082257a271
parent 11 6ff989683ec7
child 64 15948b6bf933
equal deleted inserted replaced
20:a9d4531388d0 21:91b3b8b5dbbc
   455 				}
   455 				}
   456 				if(-e $vmap){
   456 				if(-e $vmap){
   457 					@reusedHash = featurevariantmap->CheckOldVmapFile($vmap, \%FeatureVariantInfo);
   457 					@reusedHash = featurevariantmap->CheckOldVmapFile($vmap, \%FeatureVariantInfo);
   458 				}
   458 				}
   459 			}
   459 			}
   460 			if(defined(@reusedHash))
   460 			if(@reusedHash)
   461 			{
   461 			{
   462 				$FeatureVariantInfo{$bld."_LABEL"} = $reusedHash[0];
   462 				$FeatureVariantInfo{$bld."_LABEL"} = $reusedHash[0];
   463 				$FeatureVariantInfo{$bld."_FEATURES"} = $reusedHash[1];
   463 				$FeatureVariantInfo{$bld."_FEATURES"} = $reusedHash[1];
   464 				next;
   464 				next;
   465 			}
   465 			}
   556 	my $variant_info = &Path_Chop($E32env::Data{BldPath}).$Path{BldInfPath}."\\FeatureVariantInfo\\".$Plat{Real}."\\".$Plat{Real}.".".$FeatureVariantInfo{NAME}.".".&Path_Split('Base', $MMPFILE).".info";
   556 	my $variant_info = &Path_Chop($E32env::Data{BldPath}).$Path{BldInfPath}."\\FeatureVariantInfo\\".$Plat{Real}."\\".$Plat{Real}.".".$FeatureVariantInfo{NAME}.".".&Path_Split('Base', $MMPFILE).".info";
   557 	#if mmp file does not exists
   557 	#if mmp file does not exists
   558 	$variant_info = &Path_Chop($E32env::Data{BldPath}).$Path{BldInfPath}."\\FeatureVariantInfo\\".$Plat{Real}."\\".$Plat{Real}.".".$FeatureVariantInfo{NAME}.".info" if ! -e $MMPFILE;
   558 	$variant_info = &Path_Chop($E32env::Data{BldPath}).$Path{BldInfPath}."\\FeatureVariantInfo\\".$Plat{Real}."\\".$Plat{Real}.".".$FeatureVariantInfo{NAME}.".info" if ! -e $MMPFILE;
   559 # modified by SV end: makefile improvement 
   559 # modified by SV end: makefile improvement 
   560 	my $variant_key = "VARIANT_PLAT_NAME_".&Path_Split('Base', $MMPFILE);
   560 	my $variant_key = "VARIANT_PLAT_NAME_".&Path_Split('Base', $MMPFILE);
   561 	$variant_info_new = $variant_info.".tmp";
   561 	my $variant_info_new = $variant_info.".tmp";
   562 	open VARIANTINFOR_NEW, ">$variant_info_new" or die "ERROR: Can't open or create file \"$variant_info_new\"\n";
   562 	open VARIANTINFOR_NEW, ">$variant_info_new" or die "ERROR: Can't open or create file \"$variant_info_new\"\n";
   563 
   563 
   564 	# Open the variant infor file
   564 	# Open the variant infor file
   565 	open VARIANTINFOR, "<$variant_info" or die "ERROR: Can't open file \"$variant_info\"\n";
   565 	open VARIANTINFOR, "<$variant_info" or die "ERROR: Can't open file \"$variant_info\"\n";
   566 	while(<VARIANTINFOR>)
   566 	while(<VARIANTINFOR>)