BaseTools:Enables FFS to support the GUID value format

BZ:https://bugzilla.tianocore.org/show_bug.cgi?id=1768

Per FDF spec, FFS Rule can specify the hard code FILE Guid value.
But,BaseTools reports the build failure.It should be fixed.

This patch is going to fix that issue.

Cc: Bob Feng <bob.c.feng@intel.com>
Cc: Liming Gao <liming.gao@intel.com>
Signed-off-by: Zhiju.Fan <zhijux.fan@intel.com>
Reviewed-by: Liming Gao <liming.gao@intel.com>
Reviewed-by: Bob Feng <bob.c.feng@intel.com>

diff --git a/BaseTools/Source/Python/GenFds/FdfParser.py b/BaseTools/Source/Python/GenFds/FdfParser.py
index 54f61ae05eff268f2787c0df2cd201e38590d1e8..ea1c3eeb3047363f5ff6f30f81b73d46617a1b7c 100644 (file)
--- a/BaseTools/Source/Python/GenFds/FdfParser.py
+++ b/BaseTools/Source/Python/GenFds/FdfParser.py
@@ -3605,7 +3605,12 @@ class FdfParser:
 \r
         if not self._IsKeyword("$(NAMED_GUID)"):\r
             if not self._GetNextWord():\r
-                raise Warning.Expected("$(NAMED_GUID)", self.FileName, self.CurrentLineNumber)\r
+                NamedGuid = self._CurrentLine()[self.CurrentOffsetWithinLine:].split()[0].strip()\r
+                if GlobalData.gGuidPatternEnd.match(NamedGuid):\r
+                    self.CurrentOffsetWithinLine += len(NamedGuid)\r
+                    self._Token = NamedGuid\r
+                else:\r
+                    raise Warning.Expected("$(NAMED_GUID)", self.FileName, self.CurrentLineNumber)\r
             if self._Token == 'PCD':\r
                 if not self._IsToken("("):\r
                     raise Warning.Expected("'('", self.FileName, self.CurrentLineNumber)\r