# @param FlashDefinitionFile File of flash definition\r
# @param Fds FD list to be generated\r
# @param Fvs FV list to be generated\r
+ # @param Caps Capsule list to be generated\r
# @param SkuId SKU id from command line\r
#\r
def _Init(self, WorkspaceDir, ActivePlatform, Target, Toolchain, ArchList, MetaFileDb,\r
- BuildConfig, ToolDefinition, FlashDefinitionFile='', Fds=[], Fvs=[], SkuId='', UniFlag=None):\r
+ BuildConfig, ToolDefinition, FlashDefinitionFile='', Fds=None, Fvs=None, Caps=None, SkuId='', UniFlag=None):\r
+ if Fds is None:\r
+ Fds = []\r
+ if Fvs is None:\r
+ Fvs = []\r
+ if Caps is None:\r
+ Caps = []\r
self.MetaFile = ActivePlatform.MetaFile\r
self.WorkspaceDir = WorkspaceDir\r
self.Platform = ActivePlatform\r
self.FdfFile = FlashDefinitionFile\r
self.FdTargetList = Fds\r
self.FvTargetList = Fvs\r
+ self.CapTargetList = Caps\r
self.AutoGenObjectList = []\r
\r
# there's many relative directory operations, so ...\r
# Make global macros available when parsing FDF file\r
#\r
InputMacroDict.update(self.BuildDatabase.WorkspaceDb._GlobalMacros)\r
+ #\r
+ # Mark now build in AutoGen Phase\r
+ #\r
+ GlobalData.gAutoGenPhase = True \r
Fdf = FdfParser(self.FdfFile.Path)\r
Fdf.ParseFile()\r
+ GlobalData.gAutoGenPhase = False \r
PcdSet = Fdf.Profile.PcdDict\r
ModuleList = Fdf.Profile.InfList\r
self.FdfProfile = Fdf.Profile\r
#\r
self._CheckAllPcdsTokenValueConflict()\r
\r
+ #\r
+ # Check PCD type and definition between DSC and DEC\r
+ #\r
+ self._CheckPcdDefineAndType()\r
+ \r
self._BuildDir = None\r
self._FvDir = None\r
self._MakeFileDir = None\r
\r
return True\r
\r
+ def _CheckPcdDefineAndType(self):\r
+ PcdTypeList = [\r
+ "FixedAtBuild", "PatchableInModule", "FeatureFlag",\r
+ "Dynamic", #"DynamicHii", "DynamicVpd",\r
+ "DynamicEx", # "DynamicExHii", "DynamicExVpd"\r
+ ]\r
+\r
+ # This dict store PCDs which are not used by any modules with specified arches\r
+ UnusedPcd = sdict()\r
+ for Pa in self.AutoGenObjectList:\r
+ # Key of DSC's Pcds dictionary is PcdCName, TokenSpaceGuid\r
+ for Pcd in Pa.Platform.Pcds:\r
+ PcdType = Pa.Platform.Pcds[Pcd].Type\r
+ \r
+ # If no PCD type, this PCD comes from FDF \r
+ if not PcdType:\r
+ continue\r
+ \r
+ # Try to remove Hii and Vpd suffix\r
+ if PcdType.startswith("DynamicEx"):\r
+ PcdType = "DynamicEx"\r
+ elif PcdType.startswith("Dynamic"):\r
+ PcdType = "Dynamic"\r
+ \r
+ for Package in Pa.PackageList:\r
+ # Key of DEC's Pcds dictionary is PcdCName, TokenSpaceGuid, PcdType\r
+ if (Pcd[0], Pcd[1], PcdType) in Package.Pcds:\r
+ break\r
+ for Type in PcdTypeList:\r
+ if (Pcd[0], Pcd[1], Type) in Package.Pcds:\r
+ EdkLogger.error(\r
+ 'build',\r
+ FORMAT_INVALID,\r
+ "Type [%s] of PCD [%s.%s] in DSC file doesn't match the type [%s] defined in DEC file." \\r
+ % (Pa.Platform.Pcds[Pcd].Type, Pcd[1], Pcd[0], Type),\r
+ ExtraData=None\r
+ )\r
+ return\r
+ else:\r
+ UnusedPcd.setdefault(Pcd, []).append(Pa.Arch)\r
+\r
+ for Pcd in UnusedPcd:\r
+ EdkLogger.warn(\r
+ 'build',\r
+ "The PCD was not specified by any INF module in the platform for the given architecture.\n"\r
+ "\tPCD: [%s.%s]\n\tPlatform: [%s]\n\tArch: %s"\r
+ % (Pcd[1], Pcd[0], os.path.basename(str(self.MetaFile)), str(UnusedPcd[Pcd])),\r
+ ExtraData=None\r
+ )\r
+\r
def __repr__(self):\r
return "%s [%s]" % (self.MetaFile, ", ".join(self.ArchList))\r
\r
# @return None\r
#\r
def _CheckAllPcdsTokenValueConflict(self):\r
- if len(self.BuildDatabase.WorkspaceDb.PackageList) >= 1:\r
- for Package in self.BuildDatabase.WorkspaceDb.PackageList:\r
+ for Pa in self.AutoGenObjectList:\r
+ for Package in Pa.PackageList:\r
PcdList = Package.Pcds.values()\r
PcdList.sort(lambda x, y: cmp(x.TokenValue, y.TokenValue)) \r
Count = 0\r
for Pa in self.AutoGenObjectList:\r
Pa.CreateCodeFile(CreateDepsCodeFile)\r
\r
+ ## Create AsBuilt INF file the platform\r
+ #\r
+ def CreateAsBuiltInf(self):\r
+ return\r
+\r
Name = property(_GetName)\r
Guid = property(_GetGuid)\r
Version = property(_GetVersion)\r
if LibraryClass.startswith("NULL"):\r
Module.LibraryClasses[LibraryClass] = PlatformModule.LibraryClasses[LibraryClass]\r
\r
- # R9 module\r
+ # EdkII module\r
LibraryConsumerList = [Module]\r
Constructor = []\r
ConsumedByList = sdict()\r
\r
## Resolve library names to library modules\r
#\r
- # (for R8.x modules)\r
+ # (for Edk.x modules)\r
#\r
# @param Module The module from which the library names will be resolved\r
#\r
EdkLogger.verbose("Library instances of module [%s] [%s]:" % (str(Module), self.Arch))\r
LibraryConsumerList = [Module]\r
\r
- # "CompilerStub" is a must for R8 modules\r
+ # "CompilerStub" is a must for Edk modules\r
if Module.Libraries:\r
Module.Libraries.append("CompilerStub")\r
LibraryList = []\r
def _GetBaseName(self):\r
return self.Module.BaseName\r
\r
+ ## Return the module DxsFile if exist\r
+ def _GetDxsFile(self):\r
+ return self.Module.DxsFile\r
+\r
## Return the module SourceOverridePath\r
def _GetSourceOverridePath(self):\r
return self.Module.SourceOverridePath\r
def _GetModuleType(self):\r
return self.Module.ModuleType\r
\r
- ## Return the component type (for R8.x style of module)\r
+ ## Return the component type (for Edk.x style of module)\r
def _GetComponentType(self):\r
return self.Module.ComponentType\r
\r
def _GetDepexTokenList(self):\r
if self._DepexList == None:\r
self._DepexList = {}\r
- if self.IsLibrary or TAB_DEPENDENCY_EXPRESSION_FILE in self.FileTypes:\r
+ if self.DxsFile or self.IsLibrary or TAB_DEPENDENCY_EXPRESSION_FILE in self.FileTypes:\r
return self._DepexList\r
\r
self._DepexList[self.ModuleType] = []\r
def _GetDepexExpressionTokenList(self):\r
if self._DepexExpressionList == None:\r
self._DepexExpressionList = {}\r
- if self.IsLibrary or TAB_DEPENDENCY_EXPRESSION_FILE in self.FileTypes:\r
+ if self.DxsFile or self.IsLibrary or TAB_DEPENDENCY_EXPRESSION_FILE in self.FileTypes:\r
return self._DepexExpressionList\r
\r
self._DepexExpressionList[self.ModuleType] = ''\r
self._BuildTargets = {}\r
self._FileTypes = {}\r
\r
- #TRICK: call _GetSourceFileList to apply build rule for binary files\r
+ #TRICK: call _GetSourceFileList to apply build rule for source files\r
if self.SourceFileList:\r
pass\r
\r
#\r
def _GetAutoGenFileList(self):\r
UniStringAutoGenC = True\r
- UniStringBinBuffer = None\r
+ UniStringBinBuffer = StringIO()\r
if self.BuildType == 'UEFI_HII':\r
- UniStringBinBuffer = StringIO()\r
UniStringAutoGenC = False\r
if self._AutoGenFileList == None:\r
self._AutoGenFileList = {}\r
for Inc in self.Module.Includes:\r
if Inc not in self._IncludePathList:\r
self._IncludePathList.append(Inc)\r
- # for r8 modules\r
+ # for Edk modules\r
Inc = path.join(Inc, self.Arch.capitalize())\r
if os.path.exists(Inc) and Inc not in self._IncludePathList:\r
self._IncludePathList.append(Inc)\r
- # r8 module needs to put DEBUG_DIR at the end of search path and not to use SOURCE_DIR all the time\r
+ # Edk module needs to put DEBUG_DIR at the end of search path and not to use SOURCE_DIR all the time\r
self._IncludePathList.append(self.DebugDir)\r
else:\r
self._IncludePathList.append(self.MetaFile.Dir)\r
\r
for File in self.AutoGenFileList:\r
if GenC.Generate(File.Path, self.AutoGenFileList[File], File.IsBinary):\r
- #Ignore R8 AutoGen.c\r
+ #Ignore Edk AutoGen.c\r
if self.AutoGenVersion < 0x00010005 and File.Name == 'AutoGen.c':\r
continue\r
\r
ProtocolList = property(_GetProtocolList)\r
PpiList = property(_GetPpiList)\r
DepexList = property(_GetDepexTokenList)\r
+ DxsFile = property(_GetDxsFile)\r
DepexExpressionList = property(_GetDepexExpressionTokenList)\r
BuildOption = property(_GetModuleBuildOption)\r
BuildCommand = property(_GetBuildCommand)\r