## @file\r
# process FFS generation from INF statement\r
#\r
-# Copyright (c) 2007 - 2014, Intel Corporation. All rights reserved.<BR>\r
+# Copyright (c) 2007 - 2015, Intel Corporation. All rights reserved.<BR>\r
+# Copyright (c) 2014 Hewlett-Packard Development Company, L.P.<BR>\r
#\r
# This program and the accompanying materials\r
# are licensed and made available under the terms and conditions of the BSD License\r
import RuleSimpleFile\r
import RuleComplexFile\r
from CommonDataClass.FdfClass import FfsInfStatementClassObject\r
+from Common.MultipleWorkspace import MultipleWorkspace as mws\r
from Common.String import *\r
from Common.Misc import PathClass\r
from Common.Misc import GuidStructureByteArrayToGuidString\r
from Common.Misc import ProcessDuplicatedInf\r
+from Common.Misc import GetVariableOffset\r
from Common import EdkLogger\r
from Common.BuildToolError import *\r
from GuidSection import GuidSection\r
self.InfFileName = None\r
self.OverrideGuid = None\r
self.PatchedBinFile = ''\r
+ self.MacroDict = {}\r
\r
## GetFinalTargetSuffixMap() method\r
#\r
#\r
\r
self.__InfParse__(Dict)\r
+ SrcFile = mws.join( GenFdsGlobalVariable.WorkSpaceDir , self.InfFileName);\r
+ DestFile = os.path.join( self.OutputPath, self.ModuleGuid + '.ffs')\r
\r
+ SrcFileDir = "."\r
+ SrcPath = os.path.dirname(SrcFile)\r
+ SrcFileName = os.path.basename(SrcFile)\r
+ SrcFileBase, SrcFileExt = os.path.splitext(SrcFileName) \r
+ DestPath = os.path.dirname(DestFile)\r
+ DestFileName = os.path.basename(DestFile)\r
+ DestFileBase, DestFileExt = os.path.splitext(DestFileName) \r
+ self.MacroDict = {\r
+ # source file\r
+ "${src}" : SrcFile,\r
+ "${s_path}" : SrcPath,\r
+ "${s_dir}" : SrcFileDir,\r
+ "${s_name}" : SrcFileName,\r
+ "${s_base}" : SrcFileBase,\r
+ "${s_ext}" : SrcFileExt,\r
+ # destination file\r
+ "${dst}" : DestFile,\r
+ "${d_path}" : DestPath,\r
+ "${d_name}" : DestFileName,\r
+ "${d_base}" : DestFileBase,\r
+ "${d_ext}" : DestFileExt\r
+ }\r
#\r
# Allow binary type module not specify override rule in FDF file.\r
# \r
'$(NAMED_GUID)' : self.ModuleGuid\r
}\r
String = GenFdsGlobalVariable.MacroExtend(String, MacroDict)\r
+ String = GenFdsGlobalVariable.MacroExtend(String, self.MacroDict) \r
return String\r
\r
## __GetRule__() method\r
#\r
def __GetPlatformArchList__(self):\r
\r
- InfFileKey = os.path.normpath(os.path.join(GenFdsGlobalVariable.WorkSpaceDir, self.InfFileName))\r
+ InfFileKey = os.path.normpath(mws.join(GenFdsGlobalVariable.WorkSpaceDir, self.InfFileName))\r
DscArchList = []\r
PlatformDataBase = GenFdsGlobalVariable.WorkSpace.BuildObject[GenFdsGlobalVariable.ActivePlatform, 'IA32', GenFdsGlobalVariable.TargetName, GenFdsGlobalVariable.ToolChainTag]\r
if PlatformDataBase != None:\r
\r
if not HasGneratedFlag:\r
UniVfrOffsetFileSection = "" \r
- ModuleFileName = os.path.join(GenFdsGlobalVariable.WorkSpaceDir, self.InfFileName)\r
+ ModuleFileName = mws.join(GenFdsGlobalVariable.WorkSpaceDir, self.InfFileName)\r
InfData = GenFdsGlobalVariable.WorkSpace.BuildObject[PathClass(ModuleFileName), self.CurrentArch]\r
#\r
# Search the source list in InfData to find if there are .vfr file exist.\r
# @retval RetValue A list contain offset of UNI/INF object.\r
# \r
def __GetBuildOutputMapFileVfrUniInfo(self, VfrUniBaseName):\r
- \r
- RetValue = []\r
- \r
MapFileName = os.path.join(self.EfiOutputPath, self.BaseName + ".map")\r
- try:\r
- fInputfile = open(MapFileName, "r", 0)\r
- try:\r
- FileLinesList = fInputfile.readlines()\r
- except:\r
- EdkLogger.error("GenFds", FILE_READ_FAILURE, "File read failed for %s" %MapFileName,None)\r
- finally:\r
- fInputfile.close()\r
- except:\r
- EdkLogger.error("GenFds", FILE_OPEN_FAILURE, "File open failed for %s" %MapFileName,None)\r
- \r
- IsHex = False\r
- for eachLine in FileLinesList:\r
- for eachName in VfrUniBaseName.values():\r
- if eachLine.find(eachName) != -1:\r
- eachLine = eachLine.strip()\r
- Element = eachLine.split()\r
- #\r
- # MSFT/ICC/EBC map file\r
- #\r
- if (len(Element) == 4):\r
- try:\r
- int (Element[2], 16)\r
- IsHex = True\r
- except:\r
- IsHex = False\r
- \r
- if IsHex:\r
- RetValue.append((eachName, Element[2]))\r
- IsHex = False\r
- #\r
- # GCC map file\r
- #\r
- elif (len(Element) == 2) and Element[0].startswith("0x"):\r
- RetValue.append((eachName, Element[0]))\r
- \r
- return RetValue\r
+ EfiFileName = os.path.join(self.EfiOutputPath, self.BaseName + ".efi")\r
+ return GetVariableOffset(MapFileName, EfiFileName, VfrUniBaseName.values())\r
\r
## __GenUniVfrOffsetFile() method\r
#\r