sravan/system76-edk2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

BaseTools: Fix two drivers include the same file issue

Browse Source 
Two drivers include the same PCD file, the PCD value in the first
driver is correct, but it in the second driver is incorrect.

DSC:
[Components]
  Testpkg/Testdriver1.inf {
  <PcdsFixedAtBuild>
  !include Test.txt
  }
  Testpkg/Testdriver2.inf {
  <PcdsFixedAtBuild>
  !include Test.txt
  }

Cc: Liming Gao <liming.gao@intel.com>
Cc: Yonghong Zhu <yonghong.zhu@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Yunhua Feng <yunhuax.feng@intel.com>
Reviewed-by: Yonghong Zhu <yonghong.zhu@intel.com>
This commit is contained in:
Yunhua Feng
2018-06-21 15:17:24 +08:00
committed by Yonghong Zhu
parent cd7bd491f3
commit 395f333686
3 changed files with 31 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
BaseTools/Source/Python/Workspace/MetaDataTable.py
View File

@ -168,7 +168,8 @@ class TableFile(Table):
Path VARCHAR,
FullPath VARCHAR NOT NULL,
Model INTEGER DEFAULT 0,
TimeStamp SINGLE NOT NULL
TimeStamp SINGLE NOT NULL,
FromItem REAL NOT NULL
'''
def __init__(self, Cursor):
Table.__init__(self, Cursor, 'File')
@ -184,7 +185,7 @@ class TableFile(Table):
# @param Model: Model of a File
# @param TimeStamp: TimeStamp of a File
#
def Insert(self, Name, ExtName, Path, FullPath, Model, TimeStamp):
def Insert(self, Name, ExtName, Path, FullPath, Model, TimeStamp, FromItem=0):
(Name, ExtName, Path, FullPath) = ConvertToSqlString((Name, ExtName, Path, FullPath))
return Table.Insert(
self,
@ -193,7 +194,8 @@ class TableFile(Table):
Path,
FullPath,
Model,
TimeStamp
TimeStamp,
FromItem
)
## InsertFile
@ -205,7 +207,17 @@ class TableFile(Table):
#
# @retval FileID: The ID after record is inserted
#
def InsertFile(self, File, Model):
def InsertFile(self, File, Model, FromItem=''):
if FromItem:
return self.Insert(
File.Name,
File.Ext,
File.Dir,
File.Path,
Model,
File.TimeStamp,
FromItem
)
return self.Insert(
File.Name,
File.Ext,
@ -221,8 +233,11 @@ class TableFile(Table):
#
# @retval ID ID value of given file in the table
#
def GetFileId(self, File):
QueryScript = "select ID from %s where FullPath = '%s'" % (self.Table, str(File))
def GetFileId(self, File, FromItem=None):
if FromItem:
QueryScript = "select ID from %s where FullPath = '%s' and FromItem = %s" % (self.Table, str(File), str(FromItem))
else:
QueryScript = "select ID from %s where FullPath = '%s'" % (self.Table, str(File))
RecordList = self.Exec(QueryScript)
if len(RecordList) == 0:
return None