BaseTools: Dsc/Fdf conditional statement parse issue

[edk2] [PATCH] BaseTools: Dsc/Fdf conditional statement parse issue

Posted by Feng, YunhuaX 6 years, 1 month ago


Set PCD value with --pcd argument not replace
DSC/Fdf PCD value.

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>
---
 BaseTools/Source/Python/GenFds/FdfParser.py         | 4 ++++
 BaseTools/Source/Python/Workspace/MetaFileParser.py | 4 ++++
 2 files changed, 8 insertions(+)

diff --git a/BaseTools/Source/Python/GenFds/FdfParser.py b/BaseTools/Source/Python/GenFds/FdfParser.py
index 44a3564c7c..fc2b409847 100644
--- a/BaseTools/Source/Python/GenFds/FdfParser.py
+++ b/BaseTools/Source/Python/GenFds/FdfParser.py
@@ -923,10 +923,14 @@ class FdfParser:
             if ScopeMacro:
                 MacroDict.update(ScopeMacro)
 
         MacroDict.update(GlobalData.gGlobalDefines)
         MacroDict.update(GlobalData.gCommandLineDefines)
+        if GlobalData.BuildOptionPcd:
+            for Item in GlobalData.BuildOptionPcd:
+                PcdName, TmpValue = Item.split("=")
+                MacroDict[PcdName.strip()] = TmpValue
         # Highest priority
 
         return MacroDict
 
     def __EvaluateConditional(self, Expression, Line, Op = None, Value = None):
diff --git a/BaseTools/Source/Python/Workspace/MetaFileParser.py b/BaseTools/Source/Python/Workspace/MetaFileParser.py
index 95ea6fb45a..6809003d98 100644
--- a/BaseTools/Source/Python/Workspace/MetaFileParser.py
+++ b/BaseTools/Source/Python/Workspace/MetaFileParser.py
@@ -1241,10 +1241,14 @@ class DscParser(MetaFileParser):
         Macros.update(GlobalData.gPlatformDefines)
         Macros.update(GlobalData.gCommandLineDefines)
         # PCD cannot be referenced in macro definition
         if self._ItemType not in [MODEL_META_DATA_DEFINE, MODEL_META_DATA_GLOBAL_DEFINE]:
             Macros.update(self._Symbols)
+        if GlobalData.BuildOptionPcd:
+            for Item in GlobalData.BuildOptionPcd:
+                PcdName, TmpValue = Item.split("=")
+                Macros[PcdName.strip()] = TmpValue
         return Macros
 
     def _PostProcess(self):
         Processer = {
             MODEL_META_DATA_SECTION_HEADER                  :   self.__ProcessSectionHeader,
-- 
2.12.2.windows.2

_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel

Re: [edk2] [PATCH] BaseTools: Dsc/Fdf conditional statement parse issue

Posted by Zhu, Yonghong 6 years, 1 month ago

Reviewed-by: Yonghong Zhu <yonghong.zhu@intel.com> 

Best Regards,
Zhu Yonghong


-----Original Message-----
From: Feng, YunhuaX 
Sent: Thursday, March 01, 2018 8:42 PM
To: edk2-devel@lists.01.org
Cc: Zhu, Yonghong <yonghong.zhu@intel.com>; Gao, Liming <liming.gao@intel.com>
Subject: [PATCH] BaseTools: Dsc/Fdf conditional statement parse issue


Set PCD value with --pcd argument not replace DSC/Fdf PCD value.

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>
---
 BaseTools/Source/Python/GenFds/FdfParser.py         | 4 ++++
 BaseTools/Source/Python/Workspace/MetaFileParser.py | 4 ++++
 2 files changed, 8 insertions(+)

diff --git a/BaseTools/Source/Python/GenFds/FdfParser.py b/BaseTools/Source/Python/GenFds/FdfParser.py
index 44a3564c7c..fc2b409847 100644
--- a/BaseTools/Source/Python/GenFds/FdfParser.py
+++ b/BaseTools/Source/Python/GenFds/FdfParser.py
@@ -923,10 +923,14 @@ class FdfParser:
             if ScopeMacro:
                 MacroDict.update(ScopeMacro)
 
         MacroDict.update(GlobalData.gGlobalDefines)
         MacroDict.update(GlobalData.gCommandLineDefines)
+        if GlobalData.BuildOptionPcd:
+            for Item in GlobalData.BuildOptionPcd:
+                PcdName, TmpValue = Item.split("=")
+                MacroDict[PcdName.strip()] = TmpValue
         # Highest priority
 
         return MacroDict
 
     def __EvaluateConditional(self, Expression, Line, Op = None, Value = None):
diff --git a/BaseTools/Source/Python/Workspace/MetaFileParser.py b/BaseTools/Source/Python/Workspace/MetaFileParser.py
index 95ea6fb45a..6809003d98 100644
--- a/BaseTools/Source/Python/Workspace/MetaFileParser.py
+++ b/BaseTools/Source/Python/Workspace/MetaFileParser.py
@@ -1241,10 +1241,14 @@ class DscParser(MetaFileParser):
         Macros.update(GlobalData.gPlatformDefines)
         Macros.update(GlobalData.gCommandLineDefines)
         # PCD cannot be referenced in macro definition
         if self._ItemType not in [MODEL_META_DATA_DEFINE, MODEL_META_DATA_GLOBAL_DEFINE]:
             Macros.update(self._Symbols)
+        if GlobalData.BuildOptionPcd:
+            for Item in GlobalData.BuildOptionPcd:
+                PcdName, TmpValue = Item.split("=")
+                Macros[PcdName.strip()] = TmpValue
         return Macros
 
     def _PostProcess(self):
         Processer = {
             MODEL_META_DATA_SECTION_HEADER                  :   self.__ProcessSectionHeader,
--
2.12.2.windows.2

_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel