BaseTools Script: Update ConvertFceToStructurePcd to report warning messages

[mirror_edk2.git] / BaseTools / Scripts / ConvertFceToStructurePcd.py

diff --git a/BaseTools/Scripts/ConvertFceToStructurePcd.py b/BaseTools/Scripts/ConvertFceToStructurePcd.py
index 9240b8f0f3ea4ebb613a7ac7d8373e4b3cc1fe38..59eec28d5e0010e467302accaa338d006e08c0fd 100644 (file)
--- a/BaseTools/Scripts/ConvertFceToStructurePcd.py
+++ b/BaseTools/Scripts/ConvertFceToStructurePcd.py
@@ -416,7 +416,7 @@ class PATH(object):
 \r
   def header(self,struct):\r
     header={}\r
-    head_re = re.compile(r'} %s;[\s\S\n]+h{1}"'%struct,re.M|re.S)\r
+    head_re = re.compile('typedef.*} %s;[\n]+(.*?)(?:typedef|formset)'%struct,re.M|re.S)\r
     head_re2 = re.compile(r'#line[\s\d]+"(\S+h)"')\r
     for i in list(self.lstinf.keys()):\r
       with open(i,'r') as lst:\r