\r
import Common.EdkLogger as EdkLogger\r
import Common.GlobalData as GlobalData\r
+from Common.MultipleWorkspace import MultipleWorkspace as mws\r
\r
from Common.String import *\r
from Common.DataType import *\r
ModuleFile = PathClass(NormPath(Record[0]), GlobalData.gWorkspace, Arch=self._Arch)\r
RecordList = self._RawData[MODEL_META_DATA_COMPONENT_SOURCE_OVERRIDE_PATH, self._Arch, None, ModuleId]\r
if RecordList != []:\r
- SourceOverridePath = os.path.join(GlobalData.gWorkspace, NormPath(RecordList[0][0]))\r
+ SourceOverridePath = mws.join(GlobalData.gWorkspace, NormPath(RecordList[0][0]))\r
\r
# Check if the source override path exists\r
if not os.path.isdir(SourceOverridePath):\r
## Retrieve [BuildOptions]\r
def _GetBuildOptions(self):\r
if self._BuildOptions == None:\r
- OverrideTool = set()\r
self._BuildOptions = sdict()\r
#\r
# Retrieve build option for EDKII and EDK style module\r
RecordList = self._RawData[MODEL_META_DATA_BUILD_OPTION, self._Arch, CodeBase]\r
for ToolChainFamily, ToolChain, Option, Dummy1, Dummy2, Dummy3, Dummy4 in RecordList:\r
CurKey = (ToolChainFamily, ToolChain, CodeBase)\r
- if Option.startswith('='):\r
- OverrideTool.add(CurKey)\r
#\r
# Only flags can be appended\r
#\r
- if CurKey not in self._BuildOptions or not ToolChain.endswith('_FLAGS') or CurKey in OverrideTool:\r
+ if CurKey not in self._BuildOptions or not ToolChain.endswith('_FLAGS') or Option.startswith('='):\r
self._BuildOptions[CurKey] = Option\r
else:\r
self._BuildOptions[CurKey] += ' ' + Option\r
self._ModuleTypeOptions = sdict()\r
if (Edk, ModuleType) not in self._ModuleTypeOptions:\r
options = sdict()\r
- OverrideTool = set()\r
self._ModuleTypeOptions[Edk, ModuleType] = options\r
DriverType = '%s.%s' % (Edk, ModuleType)\r
RecordList = self._RawData[MODEL_META_DATA_BUILD_OPTION, self._Arch, DriverType]\r
for ToolChainFamily, ToolChain, Option, Arch, Type, Dummy3, Dummy4 in RecordList:\r
- if Arch == self._Arch and Type == DriverType:\r
+ if Type == DriverType:\r
Key = (ToolChainFamily, ToolChain, Edk)\r
- if Option.startswith('='):\r
- OverrideTool.add(Key)\r
- if Key not in options or not ToolChain.endswith('_FLAGS') or Key in OverrideTool:\r
+ if Key not in options or not ToolChain.endswith('_FLAGS') or Option.startswith('='):\r
options[Key] = Option\r
else:\r
options[Key] += ' ' + Option\r
TokenSpaceGuid,\r
self._PCD_TYPE_STRING_[Type],\r
'',\r
- '',\r
+ InitialValue,\r
'',\r
MaxDatumSize,\r
{SkuName : SkuInfo},\r
LineNo = Record[6]\r
break\r
EdkLogger.error("build", FORMAT_NOT_SUPPORTED,\r
- "MODULE_TYPE %s is not supported for EDK II, valid values are:\n %s" % (self._ModuleType,' '.join(l for l in SUP_MODULE_LIST)), \r
+ "MODULE_TYPE %s is not supported for EDK II, valid values are:\n %s" % (self._ModuleType, ' '.join(l for l in SUP_MODULE_LIST)),\r
File=self.MetaFile, Line=LineNo)\r
if (self._Specification == None) or (not 'PI_SPECIFICATION_VERSION' in self._Specification) or (int(self._Specification['PI_SPECIFICATION_VERSION'], 16) < 0x0001000A):\r
if self._ModuleType == SUP_MODULE_SMM_CORE:\r
- EdkLogger.error("build", FORMAT_NOT_SUPPORTED, "SMM_CORE module type can't be used in the module with PI_SPECIFICATION_VERSION less than 0x0001000A", File=self.MetaFile) \r
+ EdkLogger.error("build", FORMAT_NOT_SUPPORTED, "SMM_CORE module type can't be used in the module with PI_SPECIFICATION_VERSION less than 0x0001000A", File=self.MetaFile)\r
if self._Defs and 'PCI_DEVICE_ID' in self._Defs and 'PCI_VENDOR_ID' in self._Defs \\r
and 'PCI_CLASS_CODE' in self._Defs:\r
self._BuildType = 'UEFI_OPTIONROM'\r
self._BuildType = 'UEFI_HII'\r
else:\r
self._BuildType = self._ModuleType.upper()\r
- \r
+\r
if self._DxsFile:\r
File = PathClass(NormPath(self._DxsFile), self._ModuleDir, Arch=self._Arch)\r
# check the file validation\r
if not self._ComponentType:\r
EdkLogger.error("build", ATTRIBUTE_NOT_AVAILABLE,\r
"COMPONENT_TYPE is not given", File=self.MetaFile)\r
- self._BuildType = self._ComponentType.upper() \r
+ self._BuildType = self._ComponentType.upper()\r
if self._ComponentType in self._MODULE_TYPE_:\r
self._ModuleType = self._MODULE_TYPE_[self._ComponentType]\r
if self._ComponentType == 'LIBRARY':\r
Macros["EDK_SOURCE"] = GlobalData.gEcpSource\r
Macros['PROCESSOR'] = self._Arch\r
RecordList = self._RawData[MODEL_META_DATA_NMAKE, self._Arch, self._Platform]\r
- for Name,Value,Dummy,Arch,Platform,ID,LineNo in RecordList:\r
+ for Name, Value, Dummy, Arch, Platform, ID, LineNo in RecordList:\r
Value = ReplaceMacro(Value, Macros, True)\r
if Name == "IMAGE_ENTRY_POINT":\r
if self._ModuleEntryPointList == None:\r
RecordList = self._RawData[MODEL_META_DATA_HEADER, self._Arch, self._Platform]\r
for Record in RecordList:\r
if Record[1] == TAB_INF_DEFINES_INF_VERSION:\r
- self._AutoGenVersion = int(Record[2], 0)\r
+ if '.' in Record[2]:\r
+ ValueList = Record[2].split('.')\r
+ Major = '%04o' % int(ValueList[0], 0)\r
+ Minor = '%04o' % int(ValueList[1], 0)\r
+ self._AutoGenVersion = int('0x' + Major + Minor, 0)\r
+ else:\r
+ self._AutoGenVersion = int(Record[2], 0)\r
break\r
if self._AutoGenVersion == None:\r
self._AutoGenVersion = 0x00010000\r
if self.AutoGenVersion < 0x00010005:\r
Macros["EDK_SOURCE"] = GlobalData.gEcpSource\r
Macros['PROCESSOR'] = self._Arch\r
+ SourceFile = NormPath(Record[0], Macros)\r
+ if SourceFile[0] == os.path.sep:\r
+ SourceFile = mws.join(GlobalData.gWorkspace, SourceFile[1:])\r
# old module source files (Edk)\r
- File = PathClass(NormPath(Record[0], Macros), self._ModuleDir, self._SourceOverridePath,\r
+ File = PathClass(SourceFile, self._ModuleDir, self._SourceOverridePath,\r
'', False, self._Arch, ToolChainFamily, '', TagName, ToolCode)\r
# check the file validation\r
ErrorCode, ErrorInfo = File.Validate(CaseSensitive=False)\r
if File[0] == '.':\r
File = os.path.join(self._ModuleDir, File)\r
else:\r
- File = os.path.join(GlobalData.gWorkspace, File)\r
+ File = mws.join(GlobalData.gWorkspace, File)\r
File = RealPath(os.path.normpath(File))\r
if File:\r
self._Includes.append(File)\r
+ if not File and Record[0].find('EFI_SOURCE') > -1:\r
+ # tricky to regard WorkSpace as EFI_SOURCE\r
+ Macros['EFI_SOURCE'] = GlobalData.gWorkspace\r
+ File = NormPath(Record[0], Macros)\r
+ if File[0] == '.':\r
+ File = os.path.join(self._ModuleDir, File)\r
+ else:\r
+ File = os.path.join(GlobalData.gWorkspace, File)\r
+ File = RealPath(os.path.normpath(File))\r
+ if File:\r
+ self._Includes.append(File)\r
return self._Includes\r
\r
## Retrieve packages this module depends on\r
ToolChainFamily = Record[0]\r
ToolChain = Record[1]\r
Option = Record[2]\r
- if (ToolChainFamily, ToolChain) not in self._BuildOptions:\r
+ if (ToolChainFamily, ToolChain) not in self._BuildOptions or Option.startswith('='):\r
self._BuildOptions[ToolChainFamily, ToolChain] = Option\r
else:\r
# concatenate the option string if they're for the same tool\r
'build',\r
FORMAT_INVALID,\r
"No TokenValue for PCD [%s.%s] in [%s]!" % (TokenSpaceGuid, PcdCName, str(Package)),\r
- File =self.MetaFile, Line=LineNo,\r
+ File=self.MetaFile, Line=LineNo,\r
ExtraData=None\r
) \r
#\r
'build',\r
FORMAT_INVALID,\r
"The format of TokenValue [%s] of PCD [%s.%s] in [%s] is invalid:" % (Pcd.TokenValue, TokenSpaceGuid, PcdCName, str(Package)),\r
- File =self.MetaFile, Line=LineNo,\r
+ File=self.MetaFile, Line=LineNo,\r
ExtraData=None\r
)\r
\r
EdkLogger.error(\r
'build',\r
FORMAT_INVALID,\r
- "The format of TokenValue [%s] of PCD [%s.%s] in [%s] is invalid, as a decimal it should between: 0 - 4294967295!"% (Pcd.TokenValue, TokenSpaceGuid, PcdCName, str(Package)),\r
- File =self.MetaFile, Line=LineNo,\r
+ "The format of TokenValue [%s] of PCD [%s.%s] in [%s] is invalid, as a decimal it should between: 0 - 4294967295!" % (Pcd.TokenValue, TokenSpaceGuid, PcdCName, str(Package)),\r
+ File=self.MetaFile, Line=LineNo,\r
ExtraData=None\r
- ) \r
+ )\r
except:\r
EdkLogger.error(\r
'build',\r
FORMAT_INVALID,\r
- "The format of TokenValue [%s] of PCD [%s.%s] in [%s] is invalid, it should be hexadecimal or decimal!"% (Pcd.TokenValue, TokenSpaceGuid, PcdCName, str(Package)),\r
- File =self.MetaFile, Line=LineNo,\r
+ "The format of TokenValue [%s] of PCD [%s.%s] in [%s] is invalid, it should be hexadecimal or decimal!" % (Pcd.TokenValue, TokenSpaceGuid, PcdCName, str(Package)),\r
+ File=self.MetaFile, Line=LineNo,\r
ExtraData=None\r
)\r
- \r
+\r
Pcd.DatumType = PcdInPackage.DatumType\r
Pcd.MaxDatumSize = PcdInPackage.MaxDatumSize\r
Pcd.InfDefaultValue = Pcd.DefaultValue\r
'build',\r
FORMAT_INVALID,\r
"PCD [%s.%s] in [%s] is not found in dependent packages:" % (TokenSpaceGuid, PcdCName, self.MetaFile),\r
- File =self.MetaFile, Line=LineNo,\r
+ File=self.MetaFile, Line=LineNo,\r
ExtraData="\t%s" % '\n\t'.join([str(P) for P in self.Packages])\r
)\r
Pcds[PcdCName, TokenSpaceGuid] = Pcd\r
def __init__(self, DbPath, RenewDb=False):\r
self._DbClosedFlag = False\r
if not DbPath:\r
- DbPath = os.path.normpath(os.path.join(GlobalData.gWorkspace, 'Conf', GlobalData.gDatabasePath))\r
+ DbPath = os.path.normpath(mws.join(GlobalData.gWorkspace, 'Conf', GlobalData.gDatabasePath))\r
\r
# don't create necessary path for db in memory\r
if DbPath != ':memory:':\r
## Summarize all packages in the database\r
def GetPackageList(self, Platform, Arch, TargetName, ToolChainTag):\r
self.Platform = Platform\r
- PackageList =[]\r
+ PackageList = []\r
Pa = self.BuildObject[self.Platform, 'COMMON']\r
#\r
# Get Package related to Modules\r
LibObj = self.BuildObject[Lib, Arch, TargetName, ToolChainTag]\r
for Package in LibObj.Packages:\r
if Package not in PackageList:\r
- PackageList.append(Package) \r
- \r
+ PackageList.append(Package)\r
+\r
return PackageList\r
\r
## Summarize all platforms in the database\r