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