From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga18.intel.com (mga18.intel.com [134.134.136.126]) by mx.groups.io with SMTP id smtpd.web11.1276.1573700392357185390 for ; Wed, 13 Nov 2019 18:59:52 -0800 Authentication-Results: mx.groups.io; dkim=missing; spf=pass (domain: intel.com, ip: 134.134.136.126, mailfrom: bob.c.feng@intel.com) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga007.jf.intel.com ([10.7.209.58]) by orsmga106.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 13 Nov 2019 18:59:51 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.68,302,1569308400"; d="scan'208";a="194890068" Received: from fmsmsx106.amr.corp.intel.com ([10.18.124.204]) by orsmga007.jf.intel.com with ESMTP; 13 Nov 2019 18:59:51 -0800 Received: from fmsmsx123.amr.corp.intel.com (10.18.125.38) by FMSMSX106.amr.corp.intel.com (10.18.124.204) with Microsoft SMTP Server (TLS) id 14.3.439.0; Wed, 13 Nov 2019 18:59:51 -0800 Received: from shsmsx152.ccr.corp.intel.com (10.239.6.52) by fmsmsx123.amr.corp.intel.com (10.18.125.38) with Microsoft SMTP Server (TLS) id 14.3.439.0; Wed, 13 Nov 2019 18:59:50 -0800 Received: from shsmsx104.ccr.corp.intel.com ([169.254.5.127]) by SHSMSX152.ccr.corp.intel.com ([169.254.6.2]) with mapi id 14.03.0439.000; Thu, 14 Nov 2019 10:59:49 +0800 From: "Bob Feng" To: "Fan, ZhijuX" , "devel@edk2.groups.io" CC: "Gao, Liming" Subject: Re: [PATCH V2] BaseTools:Add [packages] section in dsc file Thread-Topic: [PATCH V2] BaseTools:Add [packages] section in dsc file Thread-Index: AdWairM9JYS36Rs6QsuXhur7pWjW8QADNACg Date: Thu, 14 Nov 2019 02:59:48 +0000 Message-ID: <08650203BA1BD64D8AD9B6D5D74A85D1615653E3@SHSMSX104.ccr.corp.intel.com> References: In-Reply-To: Accept-Language: zh-CN, en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [10.239.127.40] MIME-Version: 1.0 Return-Path: bob.c.feng@intel.com Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable This patch looks good. Reviewed-by: Bob Feng -----Original Message----- From: Fan, ZhijuX=20 Sent: Thursday, November 14, 2019 9:28 AM To: devel@edk2.groups.io Cc: Gao, Liming ; Feng, Bob C Subject: [PATCH V2] BaseTools:Add [packages] section in dsc file BZ:https://bugzilla.tianocore.org/show_bug.cgi?id=3D2270 Currently a PCD (e.g. FeaturePCD) cannot be used in a conditional statement= in a DSC/FDF file without a module in the build referencing the PCD packag= e DEC file. An example implementation that to support this is to allow a [Packages] sec= tion in the DSC file to list additional package dependencies for PCD refere= nces in the package DSC/FDF files. this patch is going to add the ability to have the [packages] section defi= ned in the DSC file Cc: Liming Gao Cc: Bob Feng Signed-off-by: Zhiju.Fan --- BaseTools/Source/Python/AutoGen/ModuleAutoGen.py | 29 +++++++++++++++++-= ---- BaseTools/Source/Python/AutoGen/PlatformAutoGen.py | 1 + .../Source/Python/AutoGen/WorkspaceAutoGen.py | 1 + BaseTools/Source/Python/Common/DataType.py | 1 + BaseTools/Source/Python/Workspace/DscBuildData.py | 23 ++++++++++++++++- .../Source/Python/Workspace/MetaFileParser.py | 14 +++++++++++ .../Source/Python/Workspace/WorkspaceCommon.py | 2 ++ .../Source/Python/Workspace/WorkspaceDatabase.py | 4 +++ 8 files changed, 68 insertions(+), 7 deletions(-) diff --git a/BaseTools/Source/Python/AutoGen/ModuleAutoGen.py b/BaseTools/S= ource/Python/AutoGen/ModuleAutoGen.py index f0812b6887..e6d6c43810 100755 --- a/BaseTools/Source/Python/AutoGen/ModuleAutoGen.py +++ b/BaseTools/Source/Python/AutoGen/ModuleAutoGen.py @@ -462,14 +462,31 @@ class ModuleAutoGen(AutoGen): def BuildCommand(self): return self.PlatformInfo.BuildCommand =20 - ## Get object list of all packages the module and its dependent librar= ies belong to + ## Get Module package and Platform package + # + # @retval list The list of package object + # + @cached_property + def PackageList(self): + PkagList =3D [] + if self.Module.Packages: + PkagList.extend(self.Module.Packages) + Platform =3D self.BuildDatabase[self.PlatformInfo.MetaFile, self.A= rch, self.BuildTarget, self.ToolChain] + for Package in Platform.Packages: + if Package in PkagList: + continue + PkagList.append(Package) + return PkagList + + ## Get object list of all packages the module and its dependent=20 + libraries belong to and the Platform depends on # # @retval list The list of package object # @cached_property def DerivedPackageList(self): PackageList =3D [] - for M in [self.Module] + self.DependentLibraryList: + PackageList.extend(self.PackageList) + for M in self.DependentLibraryList: for Package in M.Packages: if Package in PackageList: continue @@ -938,13 +955,13 @@ class ModuleAutoGen(AutoGen): self.Targets return self._FileTypes =20 - ## Get the list of package object the module depends on + ## Get the list of package object the module depends on and the=20 + Platform depends on # # @retval list The package object list # @cached_property def DependentPackageList(self): - return self.Module.Packages + return self.PackageList =20 ## Return the list of auto-generated code file # @@ -1101,7 +1118,7 @@ class ModuleAutoGen(AutoGen): RetVal.append(self.MetaFile.Dir) RetVal.append(self.DebugDir) =20 - for Package in self.Module.Packages: + for Package in self.PackageList: PackageDir =3D mws.join(self.WorkspaceDir, Package.MetaFile.Di= r) if PackageDir not in RetVal: RetVal.append(PackageDir) @@ -1125,7 +1142,7 @@ class Modu= leAutoGen(AutoGen): @cached_property def PackageIncludePathList(self): IncludesList =3D [] - for Package in self.Module.Packages: + for Package in self.PackageList: PackageDir =3D mws.join(self.WorkspaceDir, Package.MetaFile.Di= r) IncludesList =3D Package.Includes if Package._PrivateIncludes: diff --git a/BaseTools/Source/Python/AutoGen/PlatformAutoGen.py b/BaseTools= /Source/Python/AutoGen/PlatformAutoGen.py index debeb46f58..4c3cdf82d5 100644 --- a/BaseTools/Source/Python/AutoGen/PlatformAutoGen.py +++ b/BaseTools/Source/Python/AutoGen/PlatformAutoGen.py @@ -975,6 +975,7 @@ class PlatformAutoGen(AutoGen): continue ModuleData =3D self.BuildDatabase[ModuleFile, self.Arch, self.= BuildTarget, self.ToolChain] RetVal.update(ModuleData.Packages) + RetVal.update(self.Platform.Packages) return list(RetVal) =20 @cached_property diff --git a/BaseTools/Source/Python/AutoGen/WorkspaceAutoGen.py b/BaseTool= s/Source/Python/AutoGen/WorkspaceAutoGen.py index 9d8040905e..fde48b4b27 100644 --- a/BaseTools/Source/Python/AutoGen/WorkspaceAutoGen.py +++ b/BaseTools/Source/Python/AutoGen/WorkspaceAutoGen.py @@ -420,6 +420,7 @@ class WorkspaceAutoGen(AutoGen): continue ModuleData =3D self.BuildDatabase[ModuleFile, Arch, self.B= uildTarget, self.ToolChain] PkgSet.update(ModuleData.Packages) + PkgSet.update(Platform.Packages) Pkgs[Arch] =3D list(PkgSet) return Pkgs =20 diff --git a/BaseTools/Source/Python/Common/DataType.py b/BaseTools/Source/= Python/Common/DataType.py index 5d49afb0a9..8d80b41089 100644 --- a/BaseTools/Source/Python/Common/DataType.py +++ b/BaseTools/Source/Python/Common/DataType.py @@ -519,6 +519,7 @@ SECTIONS_HAVE_ITEM_AFTER_ARCH_SET =3D {TAB_LIBRARY_CLAS= SES.upper(), TAB_DEPEX.uppe PCDS_DYNAMICEX_VPD.upper(), PCDS_DYNAMICEX_HII.upper(), TAB_BUILD_OPTIONS.upper(), + TAB_PACKAGES.upper(), TAB_INCLUDES.upper()} =20 # diff --git a/BaseTools/Source/Python/Workspace/DscBuildData.py b/BaseTools/= Source/Python/Workspace/DscBuildData.py index 9192077f90..03a15bbf3e 100644 --- a/BaseTools/Source/Python/Workspace/DscBuildData.py +++ b/BaseTools/Source/Python/Workspace/DscBuildData.py @@ -719,6 +719,24 @@ class DscBuildData(PlatformBuildClassObject): self._RawData.DisableOverrideComponent(Components[(file_gu= id_str,str(ModuleFile))]) Components[(file_guid_str,str(ModuleFile))] =3D ModuleId self._RawData._PostProcessed =3D False + + ## Retrieve packages this Platform depends on + @cached_property + def Packages(self): + RetVal =3D set() + RecordList =3D self._RawData[MODEL_META_DATA_PACKAGE, self._Arch] + Macros =3D self._Macros + for Record in RecordList: + File =3D PathClass(NormPath(Record[0], Macros), GlobalData.gWo= rkspace, Arch=3Dself._Arch) + # check the file validation + ErrorCode, ErrorInfo =3D File.Validate('.dec') + if ErrorCode !=3D 0: + LineNo =3D Record[-1] + EdkLogger.error('build', ErrorCode, ExtraData=3DErrorInfo,= File=3Dself.MetaFile, Line=3DLineNo) + # parse this package now. we need it to get protocol/ppi/guid = value + RetVal.add(self._Bdb[File, self._Arch, self._Target, self._Too= lchain]) + return RetVal + ## Retrieve [Components] section information @property def Modules(self): @@ -896,7 +914,8 @@ class DscBuildData(PlatformBuildClassObject): continue ModuleData =3D self._Bdb[ModuleFile, self._Arch, self._Tar= get, self._Toolchain] PkgSet.update(ModuleData.Packages) - + if self.Packages: + PkgSet.update(self.Packages) self._DecPcds, self._GuidDict =3D GetDeclaredPcd(self, self._B= db, self._Arch, self._Target, self._Toolchain, PkgSet) self._GuidDict.update(GlobalData.gPlatformPcds) =20 @@ -3320,6 +3339,8 @@ class DscBuildData(PlatformBuildClassObject): continue ModuleData =3D self._Bdb[ModuleFile, self._Arch, self._Tar= get, self._Toolchain] PkgSet.update(ModuleData.Packages) + if self.Packages: + PkgSet.update(self.Packages) self._DecPcds, self._GuidDict =3D GetDeclaredPcd(self, self._B= db, self._Arch, self._Target, self._Toolchain, PkgSet) self._GuidDict.update(GlobalData.gPlatformPcds) return self._DecPcds diff --git a/BaseTools/Source/Python/Workspace/MetaFileParser.py b/BaseTool= s/Source/Python/Workspace/MetaFileParser.py index 806fc322c5..3f96ce0564 100644 --- a/BaseTools/Source/Python/Workspace/MetaFileParser.py +++ b/BaseTools/Source/Python/Workspace/MetaFileParser.py @@ -160,6 +160,7 @@ class MetaFileParser(object): self.MetaFile =3D FilePath self._FileDir =3D self.MetaFile.Dir self._Defines =3D {} + self._Packages =3D [] self._FileLocalMacros =3D {} self._SectionsMacroDict =3D defaultdict(dict) =20 @@ -351,6 +352,13 @@ class MetaFileParser(object): # If the section information is needed later, it should be stored = in database self._ValueList[0] =3D self._SectionName =20 + ## [packages] section parser + @ParseMacro + def _PackageParser(self): + self._CurrentLine =3D CleanString(self._CurrentLine) + self._Packages.append(self._CurrentLine) + self._ValueList[0] =3D self._CurrentLine + ## [defines] section parser @ParseMacro def _DefineParser(self): @@ -848,6 +856,7 @@ class DscParser(MetaFileParser): TAB_LIBRARIES.upper() : MODEL_EFI_LIBRARY_= INSTANCE, TAB_LIBRARY_CLASSES.upper() : MODEL_EFI_LIBRARY_= CLASS, TAB_BUILD_OPTIONS.upper() : MODEL_META_DATA_BU= ILD_OPTION, + TAB_PACKAGES.upper() : MODEL_META_DATA_PA= CKAGE, TAB_PCDS_FIXED_AT_BUILD_NULL.upper() : MODEL_PCD_FIXED_AT= _BUILD, TAB_PCDS_PATCHABLE_IN_MODULE_NULL.upper() : MODEL_PCD_PATCHABL= E_IN_MODULE, TAB_PCDS_FEATURE_FLAG_NULL.upper() : MODEL_PCD_FEATURE_= FLAG, @@ -1339,6 +1348,7 @@ class DscParser(MetaFileParser): MODEL_META_DATA_DEFINE : self.__Pro= cessDefine, MODEL_META_DATA_GLOBAL_DEFINE : self.__Pro= cessDefine, MODEL_META_DATA_INCLUDE : self.__Pro= cessDirective, + MODEL_META_DATA_PACKAGE : self.__Pro= cessPackages, MODEL_META_DATA_CONDITIONAL_STATEMENT_IF : self.__Pro= cessDirective, MODEL_META_DATA_CONDITIONAL_STATEMENT_ELSE : self.__Pro= cessDirective, MODEL_META_DATA_CONDITIONAL_STATEMENT_IFDEF : self.__Pro= cessDirective, @@ -1642,6 +1652,9 @@ class DscParser(MetaFileParser): self._ValueList =3D None self._ContentIndex -=3D 1 =20 + def __ProcessPackages(self): + self._ValueList[0] =3D ReplaceMacro(self._ValueList[0],=20 + self._Macros) + def __ProcessSkuId(self): self._ValueList =3D [ReplaceMacro(Value, self._Macros, RaiseError= =3DTrue) for Value in self._ValueList] @@ -1720,6 +1733,= 7 @@ class DscParser(MetaFileParser): MODEL_META_DATA_COMPONENT : _ComponentPars= er, MODEL_META_DATA_BUILD_OPTION : _BuildOptionPa= rser, MODEL_UNKNOWN : MetaFileParser= ._Skip, + MODEL_META_DATA_PACKAGE : MetaFileParser= ._PackageParser, MODEL_META_DATA_USER_EXTENSION : MetaFileParser= ._SkipUserExtension, MODEL_META_DATA_SECTION_HEADER : MetaFileParser= ._SectionHeaderParser, MODEL_META_DATA_SUBSECTION_HEADER : _SubsectionHea= derParser, diff --git a/BaseTools/Source/Python/Workspace/WorkspaceCommon.py b/BaseToo= ls/Source/Python/Workspace/WorkspaceCommon.py index 0b11ec2d59..913e710fd9 100644 --- a/BaseTools/Source/Python/Workspace/WorkspaceCommon.py +++ b/BaseTools/Source/Python/Workspace/WorkspaceCommon.py @@ -37,6 +37,8 @@ class OrderedListDict(OrderedDict): # def GetPackageList(Platform, BuildDatabase, Arch, Target, Toolchain): PkgSet =3D set() + if Platform.Packages: + PkgSet.update(Platform.Packages) for ModuleFile in Platform.Modules: Data =3D BuildDatabase[ModuleFile, Arch, Target, Toolchain] PkgSet.update(Data.Packages) diff --git a/BaseTools/Source/Python/Workspace/WorkspaceDatabase.py b/BaseT= ools/Source/Python/Workspace/WorkspaceDatabase.py index ab7b4506c1..9420eaa608 100644 --- a/BaseTools/Source/Python/Workspace/WorkspaceDatabase.py +++ b/BaseTools/Source/Python/Workspace/WorkspaceDatabase.py @@ -186,6 +186,10 @@ class WorkspaceDatabase(object): for Package in LibObj.Packages: if Package not in PackageList: PackageList.append(Package) + for Package in Pa.Packages: + if Package in PackageList: + continue + PackageList.append(Package) =20 return PackageList =20 -- 2.14.1.windows.1