BaseTools: Support nest field name in DSC/DEC

Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Feng Bob C <bob.c.feng@intel.com>
Reviewed-by: Liming Gao <liming.gao@intel.com>

1 files changed, 13 insertions, 12 deletions

diff --git a/BaseTools/Source/Python/Workspace/DscBuildData.py b/BaseTools/Source/Python/Workspace/DscBuildData.py
index 23c2c0d410..4642e761b9 100644
--- a/BaseTools/Source/Python/Workspace/DscBuildData.py
+++ b/BaseTools/Source/Python/Workspace/DscBuildData.py
@@ -1207,18 +1207,19 @@ class DscBuildData(PlatformBuildClassObject):
 

         def get_length(value):

             Value = value.strip()

-            if Value.startswith('GUID') and Value.endswith(')'):

-                return 16

-            if Value.startswith('L"') and Value.endswith('"'):

-                return len(Value[2:-1])

-            if Value[0] == '"' and Value[-1] == '"':

-                return len(Value) - 2

-            if Value[0] == '{' and Value[-1] == '}':

-                return len(Value.split(","))

-            if Value.startswith("L'") and Value.endswith("'") and len(list(Value[2:-1])) > 1:

-                return  len(list(Value[2:-1]))

-            if Value[0] == "'" and Value[-1] == "'" and len(list(Value[1:-1])) > 1:

-                return len(Value) - 2

+            if len(value) > 1:

+                if Value.startswith('GUID') and Value.endswith(')'):

+                    return 16

+                if Value.startswith('L"') and Value.endswith('"'):

+                    return len(Value[2:-1])

+                if Value[0] == '"' and Value[-1] == '"':

+                    return len(Value) - 2

+                if Value[0] == '{' and Value[-1] == '}':

+                    return len(Value.split(","))

+                if Value.startswith("L'") and Value.endswith("'") and len(list(Value[2:-1])) > 1:

+                    return  len(list(Value[2:-1]))

+                if Value[0] == "'" and Value[-1] == "'" and len(list(Value[1:-1])) > 1:

+                    return len(Value) - 2

             return len(Value)

 

         return str(max([pcd_size for pcd_size in [get_length(item) for item in sku_values]]))