## @file\r
# Common routines used by workspace\r
#\r
-# Copyright (c) 2012 - 2018, Intel Corporation. All rights reserved.<BR>\r
+# Copyright (c) 2012 - 2020, Intel Corporation. All rights reserved.<BR>\r
# SPDX-License-Identifier: BSD-2-Clause-Patent\r
#\r
\r
from Common.BuildToolError import RESOURCE_NOT_AVAILABLE\r
from Common.BuildToolError import OPTION_MISSING\r
from Common.BuildToolError import BUILD_ERROR\r
+import Common.EdkLogger as EdkLogger\r
\r
class OrderedListDict(OrderedDict):\r
def __init__(self, *args, **kwargs):\r
#\r
def GetPackageList(Platform, BuildDatabase, Arch, Target, Toolchain):\r
PkgSet = set()\r
+ if Platform.Packages:\r
+ PkgSet.update(Platform.Packages)\r
for ModuleFile in Platform.Modules:\r
Data = BuildDatabase[ModuleFile, Arch, Target, Toolchain]\r
PkgSet.update(Data.Packages)\r
break\r
if (PcdCName, PcdTokenName) not in DecPcds:\r
DecPcds[PcdCName, PcdTokenName] = Pkg.Pcds[Pcd]\r
+ if not GlobalData.gPlatformFinalPcds.get(Arch):\r
+ GlobalData.gPlatformFinalPcds[Arch] = OrderedDict()\r
+ for Name,Guid in DecPcds:\r
+ if DecPcds[Name,Guid].Type == 'FeatureFlag' or DecPcds[Name, Guid].Type == 'FixedAtBuild':\r
+ GlobalData.gPlatformFinalPcds[Arch]['%s.%s'%(Guid, Name)]=DecPcds[Name, Guid].DefaultValue\r
return DecPcds, GuidDict\r
\r
## Get all dependent libraries for a module\r
# @retval: List of dependent libraries which are InfBuildData instances\r
#\r
def GetLiabraryInstances(Module, Platform, BuildDatabase, Arch, Target, Toolchain):\r
- return GetModuleLibInstances(Module, Platform, BuildDatabase, Arch, Target, Toolchain)\r
+ return GetModuleLibInstances(Module, Platform, BuildDatabase, Arch, Target, Toolchain,Platform.MetaFile,EdkLogger)\r
\r
def GetModuleLibInstances(Module, Platform, BuildDatabase, Arch, Target, Toolchain, FileName = '', EdkLogger = None):\r
if Module.LibInstances:\r
# If a module has a MODULE_TYPE of USER_DEFINED,\r
# do not link in NULL library class instances from the global [LibraryClasses.*] sections.\r
#\r
- if Module.ModuleType != SUP_MODULE_USER_DEFINED and Module.ModuleType != SUP_MODULE_HOST_APPLICATION:\r
+ if Module.ModuleType != SUP_MODULE_USER_DEFINED:\r
for LibraryClass in Platform.LibraryClasses.GetKeys():\r
if LibraryClass.startswith("NULL") and Platform.LibraryClasses[LibraryClass, Module.ModuleType]:\r
Module.LibraryClasses[LibraryClass] = Platform.LibraryClasses[LibraryClass, Module.ModuleType]\r
ConsumedByList = OrderedListDict()\r
LibraryInstance = OrderedDict()\r
\r
- if FileName:\r
+ if not Module.LibraryClass:\r
EdkLogger.verbose("")\r
EdkLogger.verbose("Library instances of module [%s] [%s]:" % (str(Module), Arch))\r
\r
if LibraryPath is None:\r
LibraryPath = M.LibraryClasses.get(LibraryClassName)\r
if LibraryPath is None:\r
- if FileName:\r
+ if not Module.LibraryClass:\r
EdkLogger.error("build", RESOURCE_NOT_AVAILABLE,\r
"Instance of library class [%s] is not found" % LibraryClassName,\r
File=FileName,\r
or (ModuleType != SUP_MODULE_USER_DEFINED and ModuleType != SUP_MODULE_HOST_APPLICATION\r
and ModuleType not in LibraryModule.LibraryClass[0].SupModList):\r
# only USER_DEFINED can link against any library instance despite of its SupModList\r
- if FileName:\r
+ if not Module.LibraryClass:\r
EdkLogger.error("build", OPTION_MISSING,\r
"Module type [%s] is not supported by library instance [%s]" \\r
% (ModuleType, LibraryPath), File=FileName,\r
\r
LibraryInstance[LibraryClassName] = LibraryModule\r
LibraryConsumerList.append(LibraryModule)\r
- if FileName:\r
+ if not Module.LibraryClass:\r
EdkLogger.verbose("\t" + str(LibraryClassName) + " : " + str(LibraryModule))\r
else:\r
LibraryModule = LibraryInstance[LibraryClassName]\r
#\r
for Item in LibraryList:\r
if ConsumedByList[Item] and Item in Constructor and len(Constructor) > 1:\r
- if FileName:\r
+ if not Module.LibraryClass:\r
ErrorMessage = "\tconsumed by " + "\n\tconsumed by ".join(str(L) for L in ConsumedByList[Item])\r
EdkLogger.error("build", BUILD_ERROR, 'Library [%s] with constructors has a cycle' % str(Item),\r
ExtraData=ErrorMessage, File=FileName)\r