From: "Gao, Liming" <liming.gao@intel.com>
To: "Zhu, Yonghong" <yonghong.zhu@intel.com>,
"edk2-devel@lists.01.org" <edk2-devel@lists.01.org>
Subject: Re: [Patch] BaseTools: report error for same Guid's Private definition conflict
Date: Wed, 23 Nov 2016 03:12:38 +0000 [thread overview]
Message-ID: <4A89E2EF3DFEDB4C8BFDE51014F606A14B4B84F6@shsmsx102.ccr.corp.intel.com> (raw)
In-Reply-To: <1479547281-18232-1-git-send-email-yonghong.zhu@intel.com>
Reviewed-by: Liming Gao <liming.gao@intel.com>
> -----Original Message-----
> From: Zhu, Yonghong
> Sent: Saturday, November 19, 2016 5:21 PM
> To: edk2-devel@lists.01.org
> Cc: Gao, Liming <liming.gao@intel.com>
> Subject: [Patch] BaseTools: report error for same Guid's Private definition
> conflict
>
> Add error check for the same Guid/Protocol/PPIs/Includes defined as both
> Private and non-Private attribute.
>
> Fixes: https://bugzilla.tianocore.org/show_bug.cgi?id=209
> Cc: Liming Gao <liming.gao@intel.com>
> Contributed-under: TianoCore Contribution Agreement 1.0
> Signed-off-by: Yonghong Zhu <yonghong.zhu@intel.com>
> ---
> .../Source/Python/Workspace/WorkspaceDatabase.py | 33
> ++++++++++++++++++++++
> 1 file changed, 33 insertions(+)
>
> diff --git a/BaseTools/Source/Python/Workspace/WorkspaceDatabase.py
> b/BaseTools/Source/Python/Workspace/WorkspaceDatabase.py
> index ceaa4b8..b413a98 100644
> --- a/BaseTools/Source/Python/Workspace/WorkspaceDatabase.py
> +++ b/BaseTools/Source/Python/Workspace/WorkspaceDatabase.py
> @@ -1408,17 +1408,25 @@ class DecBuildData(PackageBuildClassObject):
> #
> ProtocolDict = tdict(True)
> PrivateProtocolDict = tdict(True)
> NameList = []
> PrivateNameList = []
> + PublicNameList = []
> # find out all protocol definitions for specific and 'common' arch
> RecordList = self._RawData[MODEL_EFI_PROTOCOL, self._Arch]
> for Name, Guid, Dummy, Arch, PrivateFlag, ID, LineNo in RecordList:
> if PrivateFlag == 'PRIVATE':
> if Name not in PrivateNameList:
> PrivateNameList.append(Name)
> PrivateProtocolDict[Arch, Name] = Guid
> + if Name in PublicNameList:
> + EdkLogger.error('build', OPTION_CONFLICT, "Can't
> determine %s's attribute, it is both defined as Private and non-Private
> attribute in DEC file." % Name, File=self.MetaFile, Line=LineNo)
> + else:
> + if Name not in PublicNameList:
> + PublicNameList.append(Name)
> + if Name in PrivateNameList:
> + EdkLogger.error('build', OPTION_CONFLICT, "Can't
> determine %s's attribute, it is both defined as Private and non-Private
> attribute in DEC file." % Name, File=self.MetaFile, Line=LineNo)
> if Name not in NameList:
> NameList.append(Name)
> ProtocolDict[Arch, Name] = Guid
> # use sdict to keep the order
> self._Protocols = sdict()
> @@ -1442,17 +1450,25 @@ class DecBuildData(PackageBuildClassObject):
> #
> PpiDict = tdict(True)
> PrivatePpiDict = tdict(True)
> NameList = []
> PrivateNameList = []
> + PublicNameList = []
> # find out all PPI definitions for specific arch and 'common' arch
> RecordList = self._RawData[MODEL_EFI_PPI, self._Arch]
> for Name, Guid, Dummy, Arch, PrivateFlag, ID, LineNo in RecordList:
> if PrivateFlag == 'PRIVATE':
> if Name not in PrivateNameList:
> PrivateNameList.append(Name)
> PrivatePpiDict[Arch, Name] = Guid
> + if Name in PublicNameList:
> + EdkLogger.error('build', OPTION_CONFLICT, "Can't
> determine %s's attribute, it is both defined as Private and non-Private
> attribute in DEC file." % Name, File=self.MetaFile, Line=LineNo)
> + else:
> + if Name not in PublicNameList:
> + PublicNameList.append(Name)
> + if Name in PrivateNameList:
> + EdkLogger.error('build', OPTION_CONFLICT, "Can't
> determine %s's attribute, it is both defined as Private and non-Private
> attribute in DEC file." % Name, File=self.MetaFile, Line=LineNo)
> if Name not in NameList:
> NameList.append(Name)
> PpiDict[Arch, Name] = Guid
> # use sdict to keep the order
> self._Ppis = sdict()
> @@ -1476,17 +1492,25 @@ class DecBuildData(PackageBuildClassObject):
> #
> GuidDict = tdict(True)
> PrivateGuidDict = tdict(True)
> NameList = []
> PrivateNameList = []
> + PublicNameList = []
> # find out all protocol definitions for specific and 'common' arch
> RecordList = self._RawData[MODEL_EFI_GUID, self._Arch]
> for Name, Guid, Dummy, Arch, PrivateFlag, ID, LineNo in RecordList:
> if PrivateFlag == 'PRIVATE':
> if Name not in PrivateNameList:
> PrivateNameList.append(Name)
> PrivateGuidDict[Arch, Name] = Guid
> + if Name in PublicNameList:
> + EdkLogger.error('build', OPTION_CONFLICT, "Can't
> determine %s's attribute, it is both defined as Private and non-Private
> attribute in DEC file." % Name, File=self.MetaFile, Line=LineNo)
> + else:
> + if Name not in PublicNameList:
> + PublicNameList.append(Name)
> + if Name in PrivateNameList:
> + EdkLogger.error('build', OPTION_CONFLICT, "Can't
> determine %s's attribute, it is both defined as Private and non-Private
> attribute in DEC file." % Name, File=self.MetaFile, Line=LineNo)
> if Name not in NameList:
> NameList.append(Name)
> GuidDict[Arch, Name] = Guid
> # use sdict to keep the order
> self._Guids = sdict()
> @@ -1504,10 +1528,11 @@ class DecBuildData(PackageBuildClassObject):
> ## Retrieve public include paths declared in this package
> def _GetInclude(self):
> if self._Includes == None:
> self._Includes = []
> self._PrivateIncludes = []
> + PublicInclues = []
> RecordList = self._RawData[MODEL_EFI_INCLUDE, self._Arch]
> Macros = self._Macros
> Macros["EDK_SOURCE"] = GlobalData.gEcpSource
> for Record in RecordList:
> File = PathClass(NormPath(Record[0], Macros), self._PackageDir,
> Arch=self._Arch)
> @@ -1521,10 +1546,18 @@ class DecBuildData(PackageBuildClassObject):
> if File not in self._Includes:
> self._Includes.append(File)
> if Record[4] == 'PRIVATE':
> if File not in self._PrivateIncludes:
> self._PrivateIncludes.append(File)
> + if File in PublicInclues:
> + EdkLogger.error('build', OPTION_CONFLICT, "Can't
> determine %s's attribute, it is both defined as Private and non-Private
> attribute in DEC file." % File, File=self.MetaFile, Line=LineNo)
> + else:
> + if File not in PublicInclues:
> + PublicInclues.append(File)
> + if File in self._PrivateIncludes:
> + EdkLogger.error('build', OPTION_CONFLICT, "Can't
> determine %s's attribute, it is both defined as Private and non-Private
> attribute in DEC file." % File, File=self.MetaFile, Line=LineNo)
> +
> return self._Includes
>
> ## Retrieve library class declarations (not used in build at present)
> def _GetLibraryClass(self):
> if self._LibraryClasses == None:
> --
> 2.6.1.windows.1
prev parent reply other threads:[~2016-11-23 3:12 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-11-19 9:21 [Patch] BaseTools: report error for same Guid's Private definition conflict Yonghong Zhu
2016-11-23 3:12 ` Gao, Liming [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-list from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4A89E2EF3DFEDB4C8BFDE51014F606A14B4B84F6@shsmsx102.ccr.corp.intel.com \
--to=devel@edk2.groups.io \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox