From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=192.55.52.115; helo=mga14.intel.com; envelope-from=jaben.carsey@intel.com; receiver=edk2-devel@lists.01.org Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id 89A2721E080FB for ; Tue, 24 Apr 2018 07:13:32 -0700 (PDT) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga005.fm.intel.com ([10.253.24.32]) by fmsmga103.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 24 Apr 2018 07:13:32 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.49,323,1520924400"; d="scan'208";a="222926505" Received: from fmsmsx108.amr.corp.intel.com ([10.18.124.206]) by fmsmga005.fm.intel.com with ESMTP; 24 Apr 2018 07:13:32 -0700 Received: from fmsmsx111.amr.corp.intel.com (10.18.116.5) by FMSMSX108.amr.corp.intel.com (10.18.124.206) with Microsoft SMTP Server (TLS) id 14.3.319.2; Tue, 24 Apr 2018 07:13:31 -0700 Received: from fmsmsx101.amr.corp.intel.com ([169.254.1.89]) by fmsmsx111.amr.corp.intel.com ([169.254.12.116]) with mapi id 14.03.0319.002; Tue, 24 Apr 2018 07:13:31 -0700 From: "Carsey, Jaben" To: "Zhu, Yonghong" , "edk2-devel@lists.01.org" CC: "Gao, Liming" Thread-Topic: [PATCH v1 16/27] BaseTools: Replace EDK Component strings with predefined constant Thread-Index: AQHT25+/IjBf2/QCN0GBwgkO2bjbTaQP9Xtg Date: Tue, 24 Apr 2018 14:13:31 +0000 Message-ID: References: <7ca2c5bf88ad69bc5ae86b73ee1aa696792c5794.1524239027.git.jaben.carsey@intel.com> In-Reply-To: Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-titus-metadata-40: eyJDYXRlZ29yeUxhYmVscyI6IiIsIk1ldGFkYXRhIjp7Im5zIjoiaHR0cDpcL1wvd3d3LnRpdHVzLmNvbVwvbnNcL0ludGVsMyIsImlkIjoiZTQ0NDQzODItMzk3OS00MTI5LTg1MjAtMWNmNGUzYjlkOWFkIiwicHJvcHMiOlt7Im4iOiJDVFBDbGFzc2lmaWNhdGlvbiIsInZhbHMiOlt7InZhbHVlIjoiQ1RQX05UIn1dfV19LCJTdWJqZWN0TGFiZWxzIjpbXSwiVE1DVmVyc2lvbiI6IjE2LjUuOS4zIiwiVHJ1c3RlZExhYmVsSGFzaCI6ImNwcnYwK1BhTEV6aGVzbXFYakowYk43dFZcL1cyWkhoNnpvY212NlcydVBVPSJ9 x-ctpclassification: CTP_NT x-originating-ip: [10.1.200.106] MIME-Version: 1.0 Subject: Re: [PATCH v1 16/27] BaseTools: Replace EDK Component strings with predefined constant X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.26 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 24 Apr 2018 14:13:32 -0000 Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Sure. We could make a new constant that is defined to the same value. Do = you want to propose a name? > -----Original Message----- > From: Zhu, Yonghong > Sent: Tuesday, April 24, 2018 12:42 AM > To: Carsey, Jaben ; edk2-devel@lists.01.org > Cc: Gao, Liming ; Zhu, Yonghong > > Subject: RE: [PATCH v1 16/27] BaseTools: Replace EDK Component strings > with predefined constant > Importance: High >=20 > Hi Jaben, >=20 > For build.py (-Y option) and BuildReport.py, use > EDK_COMPONENT_TYPE_LIBRARY to replace "LIBRARY" may be confusion. > One is component type, another is report type though they use same > keyword. > If we really want to do this replacement, how about use another constant > name ? besides, whether we need cover the other report type, not only the > "LIBRARY" ? >=20 > Best Regards, > Zhu Yonghong >=20 >=20 > -----Original Message----- > From: Carsey, Jaben > Sent: Friday, April 20, 2018 11:52 PM > To: edk2-devel@lists.01.org > Cc: Gao, Liming ; Zhu, Yonghong > > Subject: [PATCH v1 16/27] BaseTools: Replace EDK Component strings with > predefined constant >=20 > EDK_COMPONENT_TYPE_LIBRARY was 'LIBRARY' > EDK_COMPONENT_TYPE_SECURITY_CORE was 'SECURITY_CORE' > EDK_COMPONENT_TYPE_COMBINED_PEIM_DRIVER was > 'COMBINED_PEIM_DRIVER' > EDK_COMPONENT_TYPE_PIC_PEIM was 'PIC_PEIM' > EDK_COMPONENT_TYPE_RELOCATABLE_PEIM was 'RELOCATABLE_PEIM' > EDK_COMPONENT_TYPE_BS_DRIVER was 'BS_DRIVER' > EDK_COMPONENT_TYPE_RT_DRIVER was 'RT_DRIVER' > EDK_COMPONENT_TYPE_SAL_RT_DRIVER was 'SAL_RT_DRIVER' > EDK_COMPONENT_TYPE_APPLICATION was 'APPLICATION' >=20 > Cc: Liming Gao > Cc: Yonghong Zhu > Contributed-under: TianoCore Contribution Agreement 1.1 > Signed-off-by: Jaben Carsey > --- > BaseTools/Source/Python/Common/DataType.py | 28 ++++++++++------ > ---- > BaseTools/Source/Python/GenFds/FdfParser.py | 6 ++--- > BaseTools/Source/Python/GenFds/Ffs.py | 2 +- > BaseTools/Source/Python/Workspace/InfBuildData.py | 2 +- > BaseTools/Source/Python/build/BuildReport.py | 6 ++--- > BaseTools/Source/Python/build/build.py | 8 +++--- > 6 files changed, 26 insertions(+), 26 deletions(-) >=20 > diff --git a/BaseTools/Source/Python/Common/DataType.py > b/BaseTools/Source/Python/Common/DataType.py > index ab9acb417331..74ed711abc52 100644 > --- a/BaseTools/Source/Python/Common/DataType.py > +++ b/BaseTools/Source/Python/Common/DataType.py > @@ -80,7 +80,7 @@ SUP_MODULE_LIST_STRING =3D > TAB_VALUE_SPLIT.join(SUP_MODULE_LIST) > SUP_MODULE_SET_PEI =3D {SUP_MODULE_PEIM, SUP_MODULE_PEI_CORE} >=20 > EDK_COMPONENT_TYPE_LIBRARY =3D 'LIBRARY' > -EDK_COMPONENT_TYPE_SECUARITY_CORE =3D 'SECUARITY_CORE' > +EDK_COMPONENT_TYPE_SECURITY_CORE =3D 'SECURITY_CORE' > EDK_COMPONENT_TYPE_PEI_CORE =3D SUP_MODULE_PEI_CORE > EDK_COMPONENT_TYPE_COMBINED_PEIM_DRIVER =3D > 'COMBINED_PEIM_DRIVER' > EDK_COMPONENT_TYPE_PIC_PEIM =3D 'PIC_PEIM' > @@ -93,18 +93,18 @@ EDK_NAME =3D 'EDK' > EDKII_NAME =3D 'EDKII' >=20 > COMPONENT_TO_MODULE_MAP_DICT =3D { > - "LIBRARY" : SUP_MODULE_BASE, > - "SECURITY_CORE" : SUP_MODULE_SEC, > - SUP_MODULE_PEI_CORE : SUP_MODULE_PEI_CORE, > - "COMBINED_PEIM_DRIVER" : SUP_MODULE_PEIM, > - "PIC_PEIM" : SUP_MODULE_PEIM, > - "RELOCATABLE_PEIM" : SUP_MODULE_PEIM, > - "PE32_PEIM" : SUP_MODULE_PEIM, > - "BS_DRIVER" : SUP_MODULE_DXE_DRIVER, > - "RT_DRIVER" : SUP_MODULE_DXE_RUNTIME_DRIVER, > - "SAL_RT_DRIVER" : SUP_MODULE_DXE_SAL_DRIVER, > - "APPLICATION" : SUP_MODULE_UEFI_APPLICATION, > - "LOGO" : SUP_MODULE_BASE, > + EDK_COMPONENT_TYPE_LIBRARY : SUP_MODULE_BASE, > + EDK_COMPONENT_TYPE_SECURITY_CORE : SUP_MODULE_SEC, > + EDK_COMPONENT_TYPE_PEI_CORE : SUP_MODULE_PEI_CORE, > + EDK_COMPONENT_TYPE_COMBINED_PEIM_DRIVER : > SUP_MODULE_PEIM, > + EDK_COMPONENT_TYPE_PIC_PEIM : SUP_MODULE_PEIM, > + EDK_COMPONENT_TYPE_RELOCATABLE_PEIM : SUP_MODULE_PEIM, > + "PE32_PEIM" : SUP_MODULE_PEIM, > + EDK_COMPONENT_TYPE_BS_DRIVER : > SUP_MODULE_DXE_DRIVER, > + EDK_COMPONENT_TYPE_RT_DRIVER : > SUP_MODULE_DXE_RUNTIME_DRIVER, > + EDK_COMPONENT_TYPE_SAL_RT_DRIVER : > SUP_MODULE_DXE_SAL_DRIVER, > + EDK_COMPONENT_TYPE_APPLICATION : > SUP_MODULE_UEFI_APPLICATION, > + "LOGO" : SUP_MODULE_BASE, > } >=20 > BINARY_FILE_TYPE_FW =3D 'FW' > @@ -125,7 +125,7 @@ BINARY_FILE_TYPE_UI =3D 'UI' > BINARY_FILE_TYPE_BIN =3D 'BIN' > BINARY_FILE_TYPE_FV =3D 'FV' >=20 > -PLATFORM_COMPONENT_TYPE_LIBRARY =3D 'LIBRARY' > +PLATFORM_COMPONENT_TYPE_LIBRARY =3D > EDK_COMPONENT_TYPE_LIBRARY > PLATFORM_COMPONENT_TYPE_LIBRARY_CLASS =3D 'LIBRARY_CLASS' > PLATFORM_COMPONENT_TYPE_MODULE =3D 'MODULE' >=20 > diff --git a/BaseTools/Source/Python/GenFds/FdfParser.py > b/BaseTools/Source/Python/GenFds/FdfParser.py > index 4ec114a81883..e117a3717d42 100644 > --- a/BaseTools/Source/Python/GenFds/FdfParser.py > +++ b/BaseTools/Source/Python/GenFds/FdfParser.py > @@ -3637,8 +3637,8 @@ class FdfParser: > SUP_MODULE_DXE_DRIVER, > SUP_MODULE_DXE_SAL_DRIVER, \ > SUP_MODULE_DXE_SMM_DRIVER, > SUP_MODULE_DXE_RUNTIME_DRIVER, \ > SUP_MODULE_UEFI_DRIVER, > SUP_MODULE_UEFI_APPLICATION, SUP_MODULE_USER_DEFINED, > "DEFAULT", SUP_MODULE_BASE, \ > - "SECURITY_CORE", "COMBINED_PEIM_DRIVER", "P= IC_PEIM", > "RELOCATABLE_PEIM", \ > - "PE32_PEIM", "BS_DRIVER", "RT_DR= IVER", > "SAL_RT_DRIVER", "APPLICATION", "ACPITABLE", > SUP_MODULE_SMM_CORE, SUP_MODULE_MM_STANDALONE, > SUP_MODULE_MM_CORE_STANDALONE): > + EDK_COMPONENT_TYPE_SECURITY_CORE, > EDK_COMPONENT_TYPE_COMBINED_PEIM_DRIVER, > EDK_COMPONENT_TYPE_PIC_PEIM, > EDK_COMPONENT_TYPE_RELOCATABLE_PEIM, \ > + "PE32_PEIM", EDK_COMPONENT_TYPE_= BS_DRIVER, > EDK_COMPONENT_TYPE_RT_DRIVER, > EDK_COMPONENT_TYPE_SAL_RT_DRIVER, > EDK_COMPONENT_TYPE_APPLICATION, "ACPITABLE", > SUP_MODULE_SMM_CORE, SUP_MODULE_MM_STANDALONE, > SUP_MODULE_MM_CORE_STANDALONE): > raise Warning("Unknown Module type '%s'" % self.__Token, > self.FileName, self.CurrentLineNumber) > return self.__Token >=20 > @@ -3681,7 +3681,7 @@ class FdfParser: >=20 > Type =3D self.__Token.strip().upper() > if Type not in ("RAW", "FREEFORM", SUP_MODULE_SEC, > SUP_MODULE_PEI_CORE, SUP_MODULE_PEIM,\ > - "PEI_DXE_COMBO", "DRIVER", SUP_MODULE_DXE_C= ORE, > "APPLICATION", "FV_IMAGE", "SMM", SUP_MODULE_SMM_CORE, > SUP_MODULE_MM_STANDALONE, > SUP_MODULE_MM_CORE_STANDALONE): > + "PEI_DXE_COMBO", "DRIVER", SUP_MODULE_DXE_C= ORE, > EDK_COMPONENT_TYPE_APPLICATION, "FV_IMAGE", "SMM", > SUP_MODULE_SMM_CORE, SUP_MODULE_MM_STANDALONE, > SUP_MODULE_MM_CORE_STANDALONE): > raise Warning("Unknown FV type '%s'" % self.__Token, self.Fi= leName, > self.CurrentLineNumber) >=20 > if not self.__IsToken("=3D"): > diff --git a/BaseTools/Source/Python/GenFds/Ffs.py > b/BaseTools/Source/Python/GenFds/Ffs.py > index fc760ae8beda..f15d2330ce58 100644 > --- a/BaseTools/Source/Python/GenFds/Ffs.py > +++ b/BaseTools/Source/Python/GenFds/Ffs.py > @@ -48,7 +48,7 @@ class Ffs(FDClassObject): > SUP_MODULE_DXE_CORE : 'EFI_FV_FILETYPE_DXE_CORE', > 'FREEFORM' : 'EFI_FV_FILETYPE_FREEFORM', > 'DRIVER' : 'EFI_FV_FILETYPE_DRIVER', > - 'APPLICATION' : 'EFI_FV_FILETYPE_APPLICATION', > + EDK_COMPONENT_TYPE_APPLICATION : > 'EFI_FV_FILETYPE_APPLICATION', > 'FV_IMAGE' : 'EFI_FV_FILETYPE_FIRMWARE_VOLUME_IMAGE', > 'RAW' : 'EFI_FV_FILETYPE_RAW', > 'PEI_DXE_COMBO' : 'EFI_FV_FILETYPE_COMBINED_PEIM_DRIVER', > diff --git a/BaseTools/Source/Python/Workspace/InfBuildData.py > b/BaseTools/Source/Python/Workspace/InfBuildData.py > index d64a281a98f7..27ef163eb40c 100644 > --- a/BaseTools/Source/Python/Workspace/InfBuildData.py > +++ b/BaseTools/Source/Python/Workspace/InfBuildData.py > @@ -344,7 +344,7 @@ class InfBuildData(ModuleBuildClassObject): > self._BuildType =3D self._ComponentType.upper() > if self._ComponentType in COMPONENT_TO_MODULE_MAP_DICT: > self._ModuleType =3D > COMPONENT_TO_MODULE_MAP_DICT[self._ComponentType] > - if self._ComponentType =3D=3D 'LIBRARY': > + if self._ComponentType =3D=3D EDK_COMPONENT_TYPE_LIBRARY: > self._LibraryClass =3D [LibraryClassObject(self._BaseNam= e, > SUP_MODULE_LIST)] > # make use some [nmake] section macros > Macros =3D self._Macros > diff --git a/BaseTools/Source/Python/build/BuildReport.py > b/BaseTools/Source/Python/build/BuildReport.py > index 5846c2870d2e..02e01a1fa2ab 100644 > --- a/BaseTools/Source/Python/build/BuildReport.py > +++ b/BaseTools/Source/Python/build/BuildReport.py > @@ -599,7 +599,7 @@ class ModuleReport(object): > self.ModulePcdSet.setdefault((Pcd.TokenCName, > Pcd.TokenSpaceGuidCName, Pcd.Type), (Pcd.InfDefaultValue, > Pcd.DefaultValue)) >=20 > self.LibraryReport =3D None > - if "LIBRARY" in ReportType: > + if EDK_COMPONENT_TYPE_LIBRARY in ReportType: > self.LibraryReport =3D LibraryReport(M) >=20 > self.DepexReport =3D None > @@ -702,7 +702,7 @@ class ModuleReport(object): > if "PCD" in ReportType: > GlobalPcdReport.GenerateReport(File, self.ModulePcdSet) >=20 > - if "LIBRARY" in ReportType: > + if EDK_COMPONENT_TYPE_LIBRARY in ReportType: > self.LibraryReport.GenerateReport(File) >=20 > if "DEPEX" in ReportType: > @@ -2097,7 +2097,7 @@ class BuildReport(object): > if ReportTypeItem not in self.ReportType: > self.ReportType.append(ReportTypeItem) > else: > - self.ReportType =3D ["PCD", "LIBRARY", "BUILD_FLAGS", "D= EPEX", > "HASH", "FLASH", "FIXED_ADDRESS"] > + self.ReportType =3D ["PCD", EDK_COMPONENT_TYPE_LIBRARY, > + "BUILD_FLAGS", "DEPEX", "HASH", "FLASH", "FIXED_ADDRESS"] > ## > # Adds platform report to the list > # > diff --git a/BaseTools/Source/Python/build/build.py > b/BaseTools/Source/Python/build/build.py > index 81d59dd3eedf..29ad0c7228c7 100644 > --- a/BaseTools/Source/Python/build/build.py > +++ b/BaseTools/Source/Python/build/build.py > @@ -1587,13 +1587,13 @@ class Build(): > if not ImageClass.IsValid: > EdkLogger.error("build", FILE_PARSE_FAILURE, > ExtraData=3DImageClass.ErrorInfo) > ImageInfo =3D PeImageInfo(Module.Name, Module.Guid, > Module.Arch, Module.OutputDir, Module.DebugDir, ImageClass) > - if Module.ModuleType in [SUP_MODULE_PEI_CORE, > SUP_MODULE_PEIM, 'COMBINED_PEIM_DRIVER', 'PIC_PEIM', > 'RELOCATABLE_PEIM', SUP_MODULE_DXE_CORE]: > + if Module.ModuleType in [SUP_MODULE_PEI_CORE, > SUP_MODULE_PEIM, EDK_COMPONENT_TYPE_COMBINED_PEIM_DRIVER, > EDK_COMPONENT_TYPE_PIC_PEIM, > EDK_COMPONENT_TYPE_RELOCATABLE_PEIM, SUP_MODULE_DXE_CORE]: > PeiModuleList[Module.MetaFile] =3D ImageInfo > PeiSize +=3D ImageInfo.Image.Size > - elif Module.ModuleType in ['BS_DRIVER', > SUP_MODULE_DXE_DRIVER, SUP_MODULE_UEFI_DRIVER]: > + elif Module.ModuleType in > [EDK_COMPONENT_TYPE_BS_DRIVER, SUP_MODULE_DXE_DRIVER, > SUP_MODULE_UEFI_DRIVER]: > BtModuleList[Module.MetaFile] =3D ImageInfo > BtSize +=3D ImageInfo.Image.Size > - elif Module.ModuleType in > [SUP_MODULE_DXE_RUNTIME_DRIVER, 'RT_DRIVER', > SUP_MODULE_DXE_SAL_DRIVER, 'SAL_RT_DRIVER']: > + elif Module.ModuleType in > [SUP_MODULE_DXE_RUNTIME_DRIVER, > EDK_COMPONENT_TYPE_RT_DRIVER, SUP_MODULE_DXE_SAL_DRIVER, > EDK_COMPONENT_TYPE_SAL_RT_DRIVER]: > RtModuleList[Module.MetaFile] =3D ImageInfo > #IPF runtime driver needs to be at 2 page alignm= ent. > if IsIpfPlatform and ImageInfo.Image.Size % 0x20= 00 !=3D 0: > @@ -2356,7 +2356,7 @@ def MyOptionParser(): > Parser.add_option("-D", "--define", action=3D"append", type=3D"strin= g", > dest=3D"Macros", help=3D"Macro: \"Name [=3D Value]\".") >=20 > Parser.add_option("-y", "--report-file", action=3D"store", dest=3D"R= eportFile", > help=3D"Create/overwrite the report to the specified filename.") > - Parser.add_option("-Y", "--report-type", action=3D"append", type=3D"= choice", > choices=3D['PCD','LIBRARY','FLASH','DEPEX','BUILD_FLAGS','FIXED_ADDRESS',= 'H > ASH','EXECUTION_ORDER'], dest=3D"ReportType", default=3D[], > + Parser.add_option("-Y", "--report-type", action=3D"append", > + type=3D"choice", > + > choices=3D['PCD',EDK_COMPONENT_TYPE_LIBRARY,'FLASH','DEPEX','BUILD_FL > AGS > + ','FIXED_ADDRESS','HASH','EXECUTION_ORDER'], dest=3D"ReportType", > + default=3D[], > help=3D"Flags that control the type of build report to generate.= Must be > one of: [PCD, LIBRARY, FLASH, DEPEX, BUILD_FLAGS, FIXED_ADDRESS, HASH, > EXECUTION_ORDER]. "\ > "To specify more than one flag, repeat this option on the c= ommand > line and the default flag set is [PCD, LIBRARY, FLASH, DEPEX, HASH, > BUILD_FLAGS, FIXED_ADDRESS]") > Parser.add_option("-F", "--flag", action=3D"store", type=3D"string", > dest=3D"Flag", > -- > 2.16.2.windows.1