diff options
author | Yonghong Zhu <yonghong.zhu@intel.com> | 2017-05-22 22:01:26 +0800 |
---|---|---|
committer | Yonghong Zhu <yonghong.zhu@intel.com> | 2017-05-24 13:13:39 +0800 |
commit | 99adfe9f51cbe105ec12f0572571fc85762382fb (patch) | |
tree | 5560847b3a7ffd8afc625b6683c924e8cc8dac26 /BaseTools/Source/Python/AutoGen | |
parent | 1c47fcd465a496fe1d1493f97da02cb6b07364f5 (diff) | |
download | edk2-99adfe9f51cbe105ec12f0572571fc85762382fb.tar.gz edk2-99adfe9f51cbe105ec12f0572571fc85762382fb.tar.bz2 edk2-99adfe9f51cbe105ec12f0572571fc85762382fb.zip |
BaseTools: Fix incremental build bug on DynamicPcd Token Generation
During incremental build, we meet the bug that the different drivers use
the different token for the same DynamicPcd.
Cc: Liming Gao <liming.gao@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Yonghong Zhu <yonghong.zhu@intel.com>
Reviewed-by: Liming Gao <liming.gao@intel.com>
Diffstat (limited to 'BaseTools/Source/Python/AutoGen')
-rw-r--r-- | BaseTools/Source/Python/AutoGen/AutoGen.py | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/BaseTools/Source/Python/AutoGen/AutoGen.py b/BaseTools/Source/Python/AutoGen/AutoGen.py index 736c1ae976..fa6ec5608f 100644 --- a/BaseTools/Source/Python/AutoGen/AutoGen.py +++ b/BaseTools/Source/Python/AutoGen/AutoGen.py @@ -671,6 +671,19 @@ class WorkspaceAutoGen(AutoGen): SaveFileOnChange(os.path.join(self.BuildDir, 'BuildOptions'), content, False)
#
+ # Create PcdToken Number file for Dynamic/DynamicEx Pcd.
+ #
+ PcdTokenNumber = 'PcdTokenNumber: '
+ if Pa.PcdTokenNumber:
+ if Pa.DynamicPcdList:
+ for Pcd in Pa.DynamicPcdList:
+ PcdTokenNumber += os.linesep
+ PcdTokenNumber += str((Pcd.TokenCName, Pcd.TokenSpaceGuidCName))
+ PcdTokenNumber += ' : '
+ PcdTokenNumber += str(Pa.PcdTokenNumber[Pcd.TokenCName, Pcd.TokenSpaceGuidCName])
+ SaveFileOnChange(os.path.join(self.BuildDir, 'PcdTokenNumber'), PcdTokenNumber, False)
+
+ #
# Get set of workspace metafiles
#
AllWorkSpaceMetaFiles = self._GetMetaFiles(Target, Toolchain, Arch)
@@ -724,6 +737,10 @@ class WorkspaceAutoGen(AutoGen): #
AllWorkSpaceMetaFiles.add(os.path.join(self.BuildDir, 'BuildOptions'))
+ # add PcdToken Number file for Dynamic/DynamicEx Pcd
+ #
+ AllWorkSpaceMetaFiles.add(os.path.join(self.BuildDir, 'PcdTokenNumber'))
+
for Arch in self.ArchList:
Platform = self.BuildDatabase[self.MetaFile, Arch, Target, Toolchain]
PGen = PlatformAutoGen(self, self.MetaFile, Target, Toolchain, Arch)
|