##\r
# Import Modules\r
#\r
+from __future__ import absolute_import\r
import Common.LongFilePathOs as os\r
import sys\r
import string\r
-import thread\r
import threading\r
import time\r
import re\r
-import cPickle\r
+import pickle\r
import array\r
import shutil\r
+from random import sample\r
from struct import pack\r
from UserDict import IterableUserDict\r
from UserList import UserList\r
\r
from Common import EdkLogger as EdkLogger\r
from Common import GlobalData as GlobalData\r
-from DataType import *\r
-from BuildToolError import *\r
+from .DataType import *\r
+from .BuildToolError import *\r
from CommonDataClass.DataClass import *\r
-from Parsing import GetSplitValueList\r
+from .Parsing import GetSplitValueList\r
from Common.LongFilePathSupport import OpenLongFilePath as open\r
from Common.MultipleWorkspace import MultipleWorkspace as mws\r
import uuid\r
from CommonDataClass.Exceptions import BadExpression\r
+from Common.caching import cached_property\r
import subprocess\r
## Regular expression used to find out place holders in string template\r
gPlaceholderPattern = re.compile("\$\{([^$()\s]+)\}", re.MULTILINE | re.UNICODE)\r
pcdPatternGcc = re.compile('^([\da-fA-Fx]+) +([\da-fA-Fx]+)')\r
secReGeneral = re.compile('^([\da-fA-F]+):([\da-fA-F]+) +([\da-fA-F]+)[Hh]? +([.\w\$]+) +(\w+)', re.UNICODE)\r
\r
+StructPattern = re.compile(r'[_a-zA-Z][0-9A-Za-z_]*$')\r
+\r
## Dictionary used to store file time stamp for quick re-access\r
gFileTimeStampCache = {} # {file path : file time stamp}\r
\r
## Dictionary used to store dependencies of files\r
gDependencyDatabase = {} # arch : {file path : [dependent files list]}\r
\r
+#\r
+# If a module is built more than once with different PCDs or library classes\r
+# a temporary INF file with same content is created, the temporary file is removed\r
+# when build exits.\r
+#\r
+_TempInfs = []\r
+\r
def GetVariableOffset(mapfilepath, efifilepath, varnames):\r
- """ Parse map file to get variable offset in current EFI file \r
+ """ Parse map file to get variable offset in current EFI file\r
@param mapfilepath Map file absolution path\r
@param efifilepath: EFI binary file full path\r
@param varnames iteratable container whose elements are variable names to be searched\r
- \r
+\r
@return List whos elements are tuple with variable name and raw offset\r
"""\r
lines = []\r
f.close()\r
except:\r
return None\r
- \r
+\r
if len(lines) == 0: return None\r
firstline = lines[0].strip()\r
if (firstline.startswith("Archive member included ") and\r
if Str:\r
m = pcdPatternGcc.match(Str.strip())\r
if m is not None:\r
- varoffset.append((varname, int(m.groups(0)[0], 16) , int(sections[-1][1], 16), sections[-1][0]))\r
+ varoffset.append((varname, int(m.groups(0)[0], 16), int(sections[-1][1], 16), sections[-1][0]))\r
\r
if not varoffset:\r
return []\r
continue\r
if line.startswith("entry point at"):\r
status = 3\r
- continue \r
+ continue\r
if status == 1 and len(line) != 0:\r
m = secReGeneral.match(line)\r
assert m is not None, "Fail to parse the section in map file , line is %s" % line\r
#\r
# A temporary INF is copied to database path which must have write permission\r
# The temporary will be removed at the end of build\r
- # In case of name conflict, the file name is \r
+ # In case of name conflict, the file name is\r
# FILE_GUIDBaseName (0D1B936F-68F3-4589-AFCC-FB8B7AEBC836module.inf)\r
#\r
TempFullPath = os.path.join(DbDir,\r
#\r
# To build same module more than once, the module path with FILE_GUID overridden has\r
# the file name FILE_GUIDmodule.inf, but the relative path (self.MetaFile.File) is the real path\r
- # in DSC which is used as relative path by C files and other files in INF. \r
+ # in DSC which is used as relative path by C files and other files in INF.\r
# A trick was used: all module paths are PathClass instances, after the initialization\r
# of PathClass, the PathClass.Path is overridden by the temporary INF path.\r
#\r
# If file exists, compare contents\r
#\r
if os.path.exists(TempFullPath):\r
- with open(str(Path), 'rb') as f1: Src = f1.read()\r
- with open(TempFullPath, 'rb') as f2: Dst = f2.read()\r
- if Src == Dst:\r
- return RtPath\r
- GlobalData.gTempInfs.append(TempFullPath)\r
+ with open(str(Path), 'rb') as f1, open(TempFullPath, 'rb') as f2:\r
+ if f1.read() == f2.read():\r
+ return RtPath\r
+ _TempInfs.append(TempFullPath)\r
shutil.copy2(str(Path), TempFullPath)\r
return RtPath\r
\r
-## Remove temporary created INFs whose paths were saved in gTempInfs\r
+## Remove temporary created INFs whose paths were saved in _TempInfs\r
#\r
def ClearDuplicatedInf():\r
- for File in GlobalData.gTempInfs:\r
+ while _TempInfs:\r
+ File = _TempInfs.pop()\r
if os.path.exists(File):\r
os.remove(File)\r
\r
# @retval string The GUID value in xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx format\r
#\r
def GuidStructureStringToGuidString(GuidValue):\r
+ if not GlobalData.gGuidCFormatPattern.match(GuidValue):\r
+ return ''\r
guidValueString = GuidValue.lower().replace("{", "").replace("}", "").replace(" ", "").replace(";", "")\r
guidValueList = guidValueString.split(",")\r
if len(guidValueList) != 11:\r
EdkLogger.error(None, PERMISSION_FAILURE, "Do not have write permission on directory %s" % DirName)\r
\r
try:\r
- if GlobalData.gIsWindows:\r
- try:\r
- from PyUtility import SaveFileToDisk\r
- if not SaveFileToDisk(File, Content):\r
- EdkLogger.error(None, FILE_CREATE_FAILURE, ExtraData=File)\r
- except:\r
- Fd = open(File, "wb")\r
- Fd.write(Content)\r
- Fd.close()\r
- else:\r
- Fd = open(File, "wb")\r
- Fd.write(Content)\r
- Fd.close()\r
- except IOError, X:\r
+ Fd = open(File, "wb")\r
+ Fd.write(Content)\r
+ Fd.close()\r
+ except IOError as X:\r
EdkLogger.error(None, FILE_CREATE_FAILURE, ExtraData='IOError %s' % X)\r
\r
return True\r
Fd = None\r
try:\r
Fd = open(File, 'wb')\r
- cPickle.dump(Data, Fd, cPickle.HIGHEST_PROTOCOL)\r
+ pickle.dump(Data, Fd, pickle.HIGHEST_PROTOCOL)\r
except:\r
EdkLogger.error("", FILE_OPEN_FAILURE, ExtraData=File, RaiseError=False)\r
finally:\r
Fd = None\r
try:\r
Fd = open(File, 'rb')\r
- Data = cPickle.load(Fd)\r
- except Exception, e:\r
+ Data = pickle.load(Fd)\r
+ except Exception as e:\r
EdkLogger.verbose("Failed to load [%s]\n\t%s" % (File, str(e)))\r
Data = None\r
finally:\r
def Append(self, AppendString, Dictionary=None):\r
if Dictionary:\r
SectionList = self._Parse(AppendString)\r
- self.String += "".join([S.Instantiate(Dictionary) for S in SectionList])\r
+ self.String += "".join(S.Instantiate(Dictionary) for S in SectionList)\r
else:\r
self.String += AppendString\r
\r
# @retval str The string replaced with placeholder values\r
#\r
def Replace(self, Dictionary=None):\r
- return "".join([S.Instantiate(Dictionary) for S in self._TemplateSectionList])\r
+ return "".join(S.Instantiate(Dictionary) for S in self._TemplateSectionList)\r
\r
## Progress indicator class\r
#\r
_ListType = type([])\r
_TupleType = type(())\r
_Wildcard = 'COMMON'\r
- _ValidWildcardList = ['COMMON', 'DEFAULT', 'ALL', '*', 'PLATFORM']\r
+ _ValidWildcardList = ['COMMON', 'DEFAULT', 'ALL', TAB_STAR, 'PLATFORM']\r
\r
def __init__(self, _Single_=False, _Level_=2):\r
self._Level_ = _Level_\r
return False\r
\r
def AnalyzePcdExpression(Setting):\r
- Setting = Setting.strip()\r
+ RanStr = ''.join(sample(string.ascii_letters + string.digits, 8))\r
+ Setting = Setting.replace('\\\\', RanStr).strip()\r
# There might be escaped quote in a string: \", \\\" , \', \\\'\r
Data = Setting\r
# There might be '|' in string and in ( ... | ... ), replace it with '-'\r
break\r
FieldList.append(Setting[StartPos:Pos].strip())\r
StartPos = Pos + 1\r
-\r
+ for i, ch in enumerate(FieldList):\r
+ if RanStr in ch:\r
+ FieldList[i] = ch.replace(RanStr,'\\\\')\r
return FieldList\r
\r
def ParseDevPathValue (Value):\r
try:\r
p = subprocess.Popen(Cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE, shell=True)\r
out, err = p.communicate()\r
- except Exception, X:\r
+ except Exception as X:\r
raise BadExpression("DevicePath: %s" % (str(X)) )\r
finally:\r
subprocess._cleanup()\r
return '{' + out + '}', Size\r
\r
def ParseFieldValue (Value):\r
- if type(Value) == type(0):\r
+ if isinstance(Value, type(0)):\r
return Value, (Value.bit_length() + 7) / 8\r
- if type(Value) <> type(''):\r
+ if not isinstance(Value, type('')):\r
raise BadExpression('Type %s is %s' %(Value, type(Value)))\r
Value = Value.strip()\r
if Value.startswith(TAB_UINT8) and Value.endswith(')'):\r
Value = Value.split('(', 1)[1][:-1].strip()\r
if Value[0] == '{' and Value[-1] == '}':\r
TmpValue = GuidStructureStringToGuidString(Value)\r
- if len(TmpValue) == 0:\r
+ if not TmpValue:\r
raise BadExpression("Invalid GUID value string %s" % Value)\r
Value = TmpValue\r
if Value[0] == '"' and Value[-1] == '"':\r
Value = Value[1:-1]\r
try:\r
Value = "'" + uuid.UUID(Value).get_bytes_le() + "'"\r
- except ValueError, Message:\r
- raise BadExpression('%s' % Message)\r
+ except ValueError as Message:\r
+ raise BadExpression(Message)\r
Value, Size = ParseFieldValue(Value)\r
return Value, 16\r
if Value.startswith('L"') and Value.endswith('"'):\r
Value = Value.strip().strip('"')\r
return ParseDevPathValue(Value)\r
if Value.lower().startswith('0x'):\r
- Value = int(Value, 16)\r
+ try:\r
+ Value = int(Value, 16)\r
+ except:\r
+ raise BadExpression("invalid hex value: %s" % Value)\r
if Value == 0:\r
return 0, 1\r
return Value, (Value.bit_length() + 7) / 8\r
## AnalyzeDscPcd\r
#\r
# Analyze DSC PCD value, since there is no data type info in DSC\r
-# This fuction is used to match functions (AnalyzePcdData) used for retrieving PCD value from database\r
+# This function is used to match functions (AnalyzePcdData) used for retrieving PCD value from database\r
# 1. Feature flag: TokenSpace.PcdCName|PcdValue\r
-# 2. Fix and Patch:TokenSpace.PcdCName|PcdValue[|MaxSize]\r
+# 2. Fix and Patch:TokenSpace.PcdCName|PcdValue[|VOID*[|MaxSize]]\r
# 3. Dynamic default:\r
# TokenSpace.PcdCName|PcdValue[|VOID*[|MaxSize]]\r
# TokenSpace.PcdCName|PcdValue\r
# TokenSpace.PcdCName|VpdOffset[|VpdValue]\r
# TokenSpace.PcdCName|VpdOffset[|MaxSize[|VpdValue]]\r
# 5. Dynamic HII:\r
-# TokenSpace.PcdCName|HiiString|VaiableGuid|VariableOffset[|HiiValue]\r
+# TokenSpace.PcdCName|HiiString|VariableGuid|VariableOffset[|HiiValue]\r
# PCD value needs to be located in such kind of string, and the PCD value might be an expression in which\r
# there might have "|" operator, also in string value.\r
#\r
FieldList = AnalyzePcdExpression(Setting)\r
\r
IsValid = True\r
- if PcdType in (MODEL_PCD_FIXED_AT_BUILD, MODEL_PCD_PATCHABLE_IN_MODULE, MODEL_PCD_FEATURE_FLAG):\r
+ if PcdType in (MODEL_PCD_FIXED_AT_BUILD, MODEL_PCD_PATCHABLE_IN_MODULE, MODEL_PCD_DYNAMIC_DEFAULT, MODEL_PCD_DYNAMIC_EX_DEFAULT):\r
Value = FieldList[0]\r
Size = ''\r
- if len(FieldList) > 1:\r
- if FieldList[1].upper().startswith("0X") or FieldList[1].isdigit():\r
- Size = FieldList[1]\r
- else:\r
- DataType = FieldList[1]\r
-\r
- if len(FieldList) > 2:\r
- Size = FieldList[2]\r
- if DataType == "":\r
- IsValid = (len(FieldList) <= 1)\r
- else:\r
- IsValid = (len(FieldList) <= 3)\r
-# Value, Size = ParseFieldValue(Value)\r
- if Size:\r
- try:\r
- int(Size,16) if Size.upper().startswith("0X") else int(Size)\r
- except:\r
+ if len(FieldList) > 1 and FieldList[1]:\r
+ DataType = FieldList[1]\r
+ if FieldList[1] != TAB_VOID and StructPattern.match(FieldList[1]) is None:\r
IsValid = False\r
- Size = -1\r
- return [str(Value), '', str(Size)], IsValid, 0\r
- elif PcdType in (MODEL_PCD_DYNAMIC_DEFAULT, MODEL_PCD_DYNAMIC_EX_DEFAULT):\r
- Value = FieldList[0]\r
- Size = Type = ''\r
- if len(FieldList) > 1:\r
- Type = FieldList[1]\r
- else:\r
- Type = DataType\r
if len(FieldList) > 2:\r
Size = FieldList[2]\r
- if DataType == "":\r
- IsValid = (len(FieldList) <= 1)\r
- else:\r
- IsValid = (len(FieldList) <= 3)\r
+ if IsValid:\r
+ if DataType == "":\r
+ IsValid = (len(FieldList) <= 1)\r
+ else:\r
+ IsValid = (len(FieldList) <= 3)\r
\r
if Size:\r
try:\r
- int(Size,16) if Size.upper().startswith("0X") else int(Size)\r
+ int(Size, 16) if Size.upper().startswith("0X") else int(Size)\r
except:\r
IsValid = False\r
Size = -1\r
- return [Value, Type, str(Size)], IsValid, 0\r
+ return [str(Value), DataType, str(Size)], IsValid, 0\r
+ elif PcdType == MODEL_PCD_FEATURE_FLAG:\r
+ Value = FieldList[0]\r
+ Size = ''\r
+ IsValid = (len(FieldList) <= 1)\r
+ return [Value, DataType, str(Size)], IsValid, 0\r
elif PcdType in (MODEL_PCD_DYNAMIC_VPD, MODEL_PCD_DYNAMIC_EX_VPD):\r
VpdOffset = FieldList[0]\r
Value = Size = ''\r
IsValid = (len(FieldList) <= 3)\r
if Size:\r
try:\r
- int(Size,16) if Size.upper().startswith("0X") else int(Size)\r
+ int(Size, 16) if Size.upper().startswith("0X") else int(Size)\r
except:\r
IsValid = False\r
Size = -1\r
return [VpdOffset, str(Size), Value], IsValid, 2\r
elif PcdType in (MODEL_PCD_DYNAMIC_HII, MODEL_PCD_DYNAMIC_EX_HII):\r
+ IsValid = (3 <= len(FieldList) <= 5)\r
HiiString = FieldList[0]\r
Guid = Offset = Value = Attribute = ''\r
if len(FieldList) > 1:\r
Offset = FieldList[2]\r
if len(FieldList) > 3:\r
Value = FieldList[3]\r
+ if not Value:\r
+ IsValid = False\r
if len(FieldList) > 4:\r
Attribute = FieldList[4]\r
- IsValid = (3 <= len(FieldList) <= 5)\r
return [HiiString, Guid, Offset, Value, Attribute], IsValid, 3\r
return [], False, 0\r
\r
# Used to avoid split issue while the value string contain "|" character\r
#\r
# @param[in] Setting: A String contain value/datum type/token number information;\r
-# \r
-# @retval ValueList: A List contain value, datum type and toke number. \r
+#\r
+# @retval ValueList: A List contain value, datum type and toke number.\r
#\r
def AnalyzePcdData(Setting):\r
ValueList = ['', '', '']\r
\r
ValueRe = re.compile(r'^\s*L?\".*\|.*\"')\r
PtrValue = ValueRe.findall(Setting)\r
- \r
+\r
ValueUpdateFlag = False\r
- \r
+\r
if len(PtrValue) >= 1:\r
Setting = re.sub(ValueRe, '', Setting)\r
ValueUpdateFlag = True\r
\r
TokenList = Setting.split(TAB_VALUE_SPLIT)\r
ValueList[0:len(TokenList)] = TokenList\r
- \r
+\r
if ValueUpdateFlag:\r
ValueList[0] = PtrValue[0]\r
- \r
- return ValueList \r
- \r
+\r
+ return ValueList\r
+\r
## check format of PCD value against its the datum type\r
#\r
# For PCD value setting\r
Printset.add(TAB_PRINTCHAR_BS)\r
Printset.add(TAB_PRINTCHAR_NUL)\r
if not set(Value).issubset(Printset):\r
- PrintList = list(Printset)\r
- PrintList.sort()\r
+ PrintList = sorted(Printset)\r
return False, "Invalid PCD string value of type [%s]; must be printable chars %s." % (Type, PrintList)\r
elif Type == 'BOOLEAN':\r
if Value not in ['TRUE', 'True', 'true', '0x1', '0x01', '1', 'FALSE', 'False', 'false', '0x0', '0x00', '0']:\r
return False, "Invalid value [%s] of type [%s]; must be one of TRUE, True, true, 0x1, 0x01, 1"\\r
", FALSE, False, false, 0x0, 0x00, 0" % (Value, Type)\r
elif Type in [TAB_UINT8, TAB_UINT16, TAB_UINT32, TAB_UINT64]:\r
+ if Value and int(Value, 0) < 0:\r
+ return False, "PCD can't be set to negative value[%s] for datum type [%s]" % (Value, Type)\r
try:\r
Value = long(Value, 0)\r
+ if Value > MAX_VAL_TYPE[Type]:\r
+ return False, "Too large PCD value[%s] for datum type [%s]" % (Value, Type)\r
except:\r
return False, "Invalid value [%s] of type [%s];"\\r
" must be a hexadecimal, decimal or octal in C language format." % (Value, Type)\r
\r
Value = eval(Value) # translate escape character\r
NewValue = '{'\r
- for Index in range(0,len(Value)):\r
+ for Index in range(0, len(Value)):\r
if Unicode:\r
NewValue = NewValue + str(ord(Value[Index]) % 0x10000) + ','\r
else:\r
self.ToolCode = ToolCode\r
self.ToolChainFamily = ToolChainFamily\r
\r
- self._Key = None\r
-\r
## Convert the object of this class to a string\r
#\r
# Convert member Path of the class to a string\r
# @retval True The two PathClass are the same\r
#\r
def __eq__(self, Other):\r
- if type(Other) == type(self):\r
+ if isinstance(Other, type(self)):\r
return self.Path == Other.Path\r
else:\r
return self.Path == str(Other)\r
# @retval -1 The first PathClass is less than the second PathClass\r
# @retval 1 The first PathClass is Bigger than the second PathClass\r
def __cmp__(self, Other):\r
- if type(Other) == type(self):\r
+ if isinstance(Other, type(self)):\r
OtherKey = Other.Path\r
else:\r
OtherKey = str(Other)\r
- \r
+\r
SelfKey = self.Path\r
if SelfKey == OtherKey:\r
return 0\r
def __hash__(self):\r
return hash(self.Path)\r
\r
- def _GetFileKey(self):\r
- if self._Key is None:\r
- self._Key = self.Path.upper() # + self.ToolChainFamily + self.TagName + self.ToolCode + self.Target\r
- return self._Key\r
+ @cached_property\r
+ def Key(self):\r
+ return self.Path.upper()\r
\r
- def _GetTimeStamp(self):\r
+ @property\r
+ def TimeStamp(self):\r
return os.stat(self.Path)[8]\r
\r
def Validate(self, Type='', CaseSensitive=True):\r
self.Path = os.path.join(RealRoot, RealFile)\r
return ErrorCode, ErrorInfo\r
\r
- Key = property(_GetFileKey)\r
- TimeStamp = property(_GetTimeStamp)\r
-\r
## Parse PE image to get the required PE informaion.\r
#\r
class PeImageClass():\r
def _ByteListToStr(self, ByteList):\r
String = ''\r
for index in range(len(ByteList)):\r
- if ByteList[index] == 0: \r
+ if ByteList[index] == 0:\r
break\r
String += chr(ByteList[index])\r
return String\r
return Value\r
\r
class DefaultStore():\r
- def __init__(self,DefaultStores ):\r
+ def __init__(self, DefaultStores ):\r
\r
self.DefaultStores = DefaultStores\r
- def DefaultStoreID(self,DefaultStoreName):\r
- for key,value in self.DefaultStores.items():\r
+ def DefaultStoreID(self, DefaultStoreName):\r
+ for key, value in self.DefaultStores.items():\r
if value == DefaultStoreName:\r
return key\r
return None\r
def GetDefaultDefault(self):\r
if not self.DefaultStores or "0" in self.DefaultStores:\r
- return "0",TAB_DEFAULT_STORES_DEFAULT\r
+ return "0", TAB_DEFAULT_STORES_DEFAULT\r
else:\r
- minvalue = min([int(value_str) for value_str in self.DefaultStores])\r
+ minvalue = min(int(value_str) for value_str in self.DefaultStores)\r
return (str(minvalue), self.DefaultStores[str(minvalue)])\r
- def GetMin(self,DefaultSIdList):\r
+ def GetMin(self, DefaultSIdList):\r
if not DefaultSIdList:\r
return TAB_DEFAULT_STORES_DEFAULT\r
storeidset = {storeid for storeid, storename in self.DefaultStores.values() if storename in DefaultSIdList}\r
if not storeidset:\r
return ""\r
minid = min(storeidset )\r
- for sid,name in self.DefaultStores.values():\r
+ for sid, name in self.DefaultStores.values():\r
if sid == minid:\r
return name\r
+\r
class SkuClass():\r
- \r
DEFAULT = 0\r
SINGLE = 1\r
MULTIPLE =2\r
- \r
+\r
def __init__(self,SkuIdentifier='', SkuIds=None):\r
if SkuIds is None:\r
SkuIds = {}\r
\r
for SkuName in SkuIds:\r
SkuId = SkuIds[SkuName][0]\r
- skuid_num = int(SkuId,16) if SkuId.upper().startswith("0X") else int(SkuId)\r
+ skuid_num = int(SkuId, 16) if SkuId.upper().startswith("0X") else int(SkuId)\r
if skuid_num > 0xFFFFFFFFFFFFFFFF:\r
EdkLogger.error("build", PARAMETER_INVALID,\r
ExtraData = "SKU-ID [%s] value %s exceeds the max value of UINT64"\r
% (SkuName, SkuId))\r
- \r
+\r
self.AvailableSkuIds = sdict()\r
self.SkuIdSet = []\r
self.SkuIdNumberSet = []\r
self.SkuData = SkuIds\r
- self.__SkuInherit = {}\r
- self.__SkuIdentifier = SkuIdentifier\r
+ self._SkuInherit = {}\r
+ self._SkuIdentifier = SkuIdentifier\r
if SkuIdentifier == '' or SkuIdentifier is None:\r
self.SkuIdSet = ['DEFAULT']\r
self.SkuIdNumberSet = ['0U']\r
self.SkuIdSet = SkuIds.keys()\r
self.SkuIdNumberSet = [num[0].strip() + 'U' for num in SkuIds.values()]\r
else:\r
- r = SkuIdentifier.split('|') \r
+ r = SkuIdentifier.split('|')\r
self.SkuIdSet=[(r[k].strip()).upper() for k in range(len(r))]\r
k = None\r
- try: \r
+ try:\r
self.SkuIdNumberSet = [SkuIds[k][0].strip() + 'U' for k in self.SkuIdSet]\r
except Exception:\r
EdkLogger.error("build", PARAMETER_INVALID,\r
EdkLogger.error("build", PARAMETER_INVALID,\r
ExtraData="SKU-ID [%s] is not supported by the platform. [Valid SKU-ID: %s]"\r
% (each, " | ".join(SkuIds.keys())))\r
- if self.SkuUsageType != self.SINGLE:\r
+ if self.SkuUsageType != SkuClass.SINGLE:\r
self.AvailableSkuIds.update({'DEFAULT':0, 'COMMON':0})\r
if self.SkuIdSet:\r
GlobalData.gSkuids = (self.SkuIdSet)\r
GlobalData.gSkuids.sort()\r
\r
def GetNextSkuId(self, skuname):\r
- if not self.__SkuInherit:\r
- self.__SkuInherit = {}\r
+ if not self._SkuInherit:\r
+ self._SkuInherit = {}\r
for item in self.SkuData.values():\r
- self.__SkuInherit[item[1]]=item[2] if item[2] else "DEFAULT"\r
- return self.__SkuInherit.get(skuname,"DEFAULT")\r
+ self._SkuInherit[item[1]]=item[2] if item[2] else "DEFAULT"\r
+ return self._SkuInherit.get(skuname, "DEFAULT")\r
\r
- def GetSkuChain(self,sku):\r
+ def GetSkuChain(self, sku):\r
if sku == "DEFAULT":\r
return ["DEFAULT"]\r
skulist = [sku]\r
nextsku = sku\r
- while 1:\r
+ while True:\r
nextsku = self.GetNextSkuId(nextsku)\r
skulist.append(nextsku)\r
if nextsku == "DEFAULT":\r
skuorderset = []\r
for skuname in self.SkuIdSet:\r
skuorderset.append(self.GetSkuChain(skuname))\r
- \r
+\r
skuorder = []\r
- for index in range(max([len(item) for item in skuorderset])):\r
+ for index in range(max(len(item) for item in skuorderset)):\r
for subset in skuorderset:\r
if index > len(subset)-1:\r
continue\r
\r
return skuorder\r
\r
- def __SkuUsageType(self): \r
- \r
- if self.__SkuIdentifier.upper() == "ALL":\r
+ @property\r
+ def SkuUsageType(self):\r
+ if self._SkuIdentifier.upper() == "ALL":\r
return SkuClass.MULTIPLE\r
\r
if len(self.SkuIdSet) == 1:\r
if self.SkuIdSet[0] == 'DEFAULT':\r
return SkuClass.DEFAULT\r
- else:\r
- return SkuClass.SINGLE\r
- elif len(self.SkuIdSet) == 2:\r
- if 'DEFAULT' in self.SkuIdSet:\r
- return SkuClass.SINGLE\r
- else:\r
- return SkuClass.MULTIPLE\r
- else:\r
- return SkuClass.MULTIPLE\r
- def DumpSkuIdArrary(self):\r
+ return SkuClass.SINGLE\r
+ if len(self.SkuIdSet) == 2 and 'DEFAULT' in self.SkuIdSet:\r
+ return SkuClass.SINGLE\r
+ return SkuClass.MULTIPLE\r
\r
- ArrayStrList = []\r
+ def DumpSkuIdArrary(self):\r
if self.SkuUsageType == SkuClass.SINGLE:\r
- ArrayStr = "{0x0}"\r
- else:\r
- for skuname in self.AvailableSkuIds:\r
- if skuname == "COMMON":\r
- continue\r
- while skuname != "DEFAULT":\r
- ArrayStrList.append(hex(int(self.AvailableSkuIds[skuname])))\r
- skuname = self.GetNextSkuId(skuname)\r
- ArrayStrList.append("0x0")\r
- ArrayStr = "{" + ",".join(ArrayStrList) + "}"\r
- return ArrayStr\r
- def __GetAvailableSkuIds(self):\r
+ return "{0x0}"\r
+ ArrayStrList = []\r
+ for skuname in self.AvailableSkuIds:\r
+ if skuname == "COMMON":\r
+ continue\r
+ while skuname != "DEFAULT":\r
+ ArrayStrList.append(hex(int(self.AvailableSkuIds[skuname])))\r
+ skuname = self.GetNextSkuId(skuname)\r
+ ArrayStrList.append("0x0")\r
+ return "{{{myList}}}".format(myList=",".join(ArrayStrList))\r
+\r
+ @property\r
+ def AvailableSkuIdSet(self):\r
return self.AvailableSkuIds\r
- \r
- def __GetSystemSkuID(self):\r
- if self.__SkuUsageType() == SkuClass.SINGLE:\r
+\r
+ @property\r
+ def SystemSkuId(self):\r
+ if self.SkuUsageType == SkuClass.SINGLE:\r
if len(self.SkuIdSet) == 1:\r
return self.SkuIdSet[0]\r
else:\r
return self.SkuIdSet[0] if self.SkuIdSet[0] != 'DEFAULT' else self.SkuIdSet[1]\r
else:\r
return 'DEFAULT'\r
- def __GetAvailableSkuIdNumber(self):\r
- return self.SkuIdNumberSet\r
- SystemSkuId = property(__GetSystemSkuID)\r
- AvailableSkuIdSet = property(__GetAvailableSkuIds)\r
- SkuUsageType = property(__SkuUsageType)\r
- AvailableSkuIdNumSet = property(__GetAvailableSkuIdNumber)\r
\r
#\r
# Pack a registry format GUID\r
#\r
def PackRegistryFormatGuid(Guid):\r
- Guid = Guid.split('-')\r
- return pack('=LHHBBBBBBBB',\r
- int(Guid[0], 16),\r
- int(Guid[1], 16),\r
- int(Guid[2], 16),\r
- int(Guid[3][-4:-2], 16),\r
- int(Guid[3][-2:], 16),\r
- int(Guid[4][-12:-10], 16),\r
- int(Guid[4][-10:-8], 16),\r
- int(Guid[4][-8:-6], 16),\r
- int(Guid[4][-6:-4], 16),\r
- int(Guid[4][-4:-2], 16),\r
- int(Guid[4][-2:], 16)\r
- )\r
+ return PackGUID(Guid.split('-'))\r
\r
## Get the integer value from string like "14U" or integer like 2\r
#\r
else:\r
return int(String)\r
\r
+#\r
+# Pack a GUID (registry format) list into a buffer and return it\r
+#\r
+def PackGUID(Guid):\r
+ return pack(PACK_PATTERN_GUID,\r
+ int(Guid[0], 16),\r
+ int(Guid[1], 16),\r
+ int(Guid[2], 16),\r
+ int(Guid[3][-4:-2], 16),\r
+ int(Guid[3][-2:], 16),\r
+ int(Guid[4][-12:-10], 16),\r
+ int(Guid[4][-10:-8], 16),\r
+ int(Guid[4][-8:-6], 16),\r
+ int(Guid[4][-6:-4], 16),\r
+ int(Guid[4][-4:-2], 16),\r
+ int(Guid[4][-2:], 16)\r
+ )\r
+\r
+#\r
+# Pack a GUID (byte) list into a buffer and return it\r
+#\r
+def PackByteFormatGUID(Guid):\r
+ return pack(PACK_PATTERN_GUID,\r
+ Guid[0],\r
+ Guid[1],\r
+ Guid[2],\r
+ Guid[3],\r
+ Guid[4],\r
+ Guid[5],\r
+ Guid[6],\r
+ Guid[7],\r
+ Guid[8],\r
+ Guid[9],\r
+ Guid[10],\r
+ )\r
+\r
##\r
#\r
# This acts like the main() function for the script, unless it is 'import'ed into another\r