Sync EDKII BaseTools to BaseTools project r2042.

[mirror_edk2.git] / BaseTools / Source / Python / GenFds / FdfParser.py

diff --git a/BaseTools/Source/Python/GenFds/FdfParser.py b/BaseTools/Source/Python/GenFds/FdfParser.py
index 69a489849932e5504ab03ba637af8b8181b15644..d11af6c1346c98b62d4fa4d1bb25d225db814cb6 100644 (file)
--- a/BaseTools/Source/Python/GenFds/FdfParser.py
+++ b/BaseTools/Source/Python/GenFds/FdfParser.py
@@ -43,6 +43,8 @@ import OptRomFileStatement
 from GenFdsGlobalVariable import GenFdsGlobalVariable\r
 from Common.BuildToolError import *\r
 from Common import EdkLogger\r
+from Common.Misc import PathClass\r
+from Common.String import NormPath\r
 \r
 import re\r
 import os\r
@@ -205,6 +207,8 @@ class FdfParser:
         self.__SkippedChars = ""\r
 \r
         self.__WipeOffArea = []\r
+        if GenFdsGlobalVariable.WorkSpaceDir == '':\r
+            GenFdsGlobalVariable.WorkSpaceDir = os.getenv("WORKSPACE")\r
 \r
     ## __IsWhiteSpace() method\r
     #\r
@@ -747,7 +751,7 @@ class FdfParser:
                     raise Warning("Value %s is not a number", self.FileName, Line)\r
 \r
         for Profile in AllMacroList:\r
-            if Profile.FileName == FileLineTuple[0] and Profile.MacroName == Name and Profile.DefinedAtLine <= FileLineTuple[1]:\r
+            if Profile.MacroName == Name and Profile.DefinedAtLine <= FileLineTuple[1]:\r
                 if Op == None:\r
                     if Value == 'Bool' and Profile.MacroValue == None or Profile.MacroValue.upper() == 'FALSE':\r
                         return False\r
@@ -2145,6 +2149,11 @@ class FdfParser:
         if not self.__GetNextToken():\r
             raise Warning("expected INF file path", self.FileName, self.CurrentLineNumber)\r
         ffsInf.InfFileName = self.__Token\r
+        if ffsInf.InfFileName.replace('$(WORKSPACE)', '').find('$') == -1:\r
+            #do case sensitive check for file path\r
+            ErrorCode, ErrorInfo = PathClass(NormPath(ffsInf.InfFileName), GenFdsGlobalVariable.WorkSpaceDir).Validate()\r
+            if ErrorCode != 0:\r
+                EdkLogger.error("GenFds", ErrorCode, ExtraData=ErrorInfo)\r
 \r
         if not ffsInf.InfFileName in self.Profile.InfList:\r
             self.Profile.InfList.append(ffsInf.InfFileName)\r
@@ -2352,6 +2361,11 @@ class FdfParser:
             self.__GetSectionData( FfsFileObj, MacroDict)\r
         else:\r
             FfsFileObj.FileName = self.__Token\r
+            if FfsFileObj.FileName.replace('$(WORKSPACE)', '').find('$') == -1:\r
+                #do case sensitive check for file path\r
+                ErrorCode, ErrorInfo = PathClass(NormPath(FfsFileObj.FileName), GenFdsGlobalVariable.WorkSpaceDir).Validate()\r
+                if ErrorCode != 0:\r
+                    EdkLogger.error("GenFds", ErrorCode, ExtraData=ErrorInfo)\r
 \r
         if not self.__IsToken( "}"):\r
             raise Warning("expected '}'", self.FileName, self.CurrentLineNumber)\r
@@ -2597,6 +2611,11 @@ class FdfParser:
                 if not self.__GetNextToken():\r
                     raise Warning("expected section file path", self.FileName, self.CurrentLineNumber)\r
                 DataSectionObj.SectFileName = self.__Token\r
+                if DataSectionObj.SectFileName.replace('$(WORKSPACE)', '').find('$') == -1:\r
+                    #do case sensitive check for file path\r
+                    ErrorCode, ErrorInfo = PathClass(NormPath(DataSectionObj.SectFileName), GenFdsGlobalVariable.WorkSpaceDir).Validate()\r
+                    if ErrorCode != 0:\r
+                        EdkLogger.error("GenFds", ErrorCode, ExtraData=ErrorInfo)\r
             else:\r
                 if not self.__GetCglSection(DataSectionObj):\r
                     return False\r
@@ -2684,8 +2703,8 @@ class FdfParser:
     def __GetGuidAttrib(self):\r
 \r
         AttribDict = {}\r
-        AttribDict["PROCESSING_REQUIRED"] = False\r
-        AttribDict["AUTH_STATUS_VALID"] = False\r
+        AttribDict["PROCESSING_REQUIRED"] = "NONE"\r
+        AttribDict["AUTH_STATUS_VALID"] = "NONE"\r
         if self.__IsKeyword("PROCESSING_REQUIRED") or self.__IsKeyword("AUTH_STATUS_VALID"):\r
             AttribKey = self.__Token\r
 \r
@@ -3513,6 +3532,11 @@ class FdfParser:
                 raise Warning("expected Reset file", self.FileName, self.CurrentLineNumber)\r
 \r
             VtfObj.ResetBin = self.__Token\r
+            if VtfObj.ResetBin.replace('$(WORKSPACE)', '').find('$') == -1:\r
+                #check for file path\r
+                ErrorCode, ErrorInfo = PathClass(NormPath(VtfObj.ResetBin), GenFdsGlobalVariable.WorkSpaceDir).Validate()\r
+                if ErrorCode != 0:\r
+                    EdkLogger.error("GenFds", ErrorCode, ExtraData=ErrorInfo)\r
 \r
         while self.__GetComponentStatement(VtfObj):\r
             pass\r
@@ -3615,6 +3639,11 @@ class FdfParser:
             raise Warning("expected Component file", self.FileName, self.CurrentLineNumber)\r
 \r
         CompStatementObj.CompBin = self.__Token\r
+        if CompStatementObj.CompBin != '-' and CompStatementObj.CompBin.replace('$(WORKSPACE)', '').find('$') == -1:\r
+            #check for file path\r
+            ErrorCode, ErrorInfo = PathClass(NormPath(CompStatementObj.CompBin), GenFdsGlobalVariable.WorkSpaceDir).Validate()\r
+            if ErrorCode != 0:\r
+                EdkLogger.error("GenFds", ErrorCode, ExtraData=ErrorInfo)\r
 \r
         if not self.__IsKeyword("COMP_SYM"):\r
             raise Warning("expected COMP_SYM", self.FileName, self.CurrentLineNumber)\r
@@ -3626,6 +3655,11 @@ class FdfParser:
             raise Warning("expected Component symbol file", self.FileName, self.CurrentLineNumber)\r
 \r
         CompStatementObj.CompSym = self.__Token\r
+        if CompStatementObj.CompSym != '-' and CompStatementObj.CompSym.replace('$(WORKSPACE)', '').find('$') == -1:\r
+            #check for file path\r
+            ErrorCode, ErrorInfo = PathClass(NormPath(CompStatementObj.CompSym), GenFdsGlobalVariable.WorkSpaceDir).Validate()\r
+            if ErrorCode != 0:\r
+                EdkLogger.error("GenFds", ErrorCode, ExtraData=ErrorInfo)\r
 \r
         if not self.__IsKeyword("COMP_SIZE"):\r
             raise Warning("expected COMP_SIZE", self.FileName, self.CurrentLineNumber)\r
@@ -3703,6 +3737,11 @@ class FdfParser:
         if not self.__GetNextToken():\r
             raise Warning("expected INF file path", self.FileName, self.CurrentLineNumber)\r
         ffsInf.InfFileName = self.__Token\r
+        if ffsInf.InfFileName.replace('$(WORKSPACE)', '').find('$') == -1:\r
+            #check for file path\r
+            ErrorCode, ErrorInfo = PathClass(NormPath(ffsInf.InfFileName), GenFdsGlobalVariable.WorkSpaceDir).Validate()\r
+            if ErrorCode != 0:\r
+                EdkLogger.error("GenFds", ErrorCode, ExtraData=ErrorInfo)\r
 \r
         if not ffsInf.InfFileName in self.Profile.InfList:\r
             self.Profile.InfList.append(ffsInf.InfFileName)\r
@@ -3795,6 +3834,11 @@ class FdfParser:
         if not self.__GetNextToken():\r
             raise Warning("expected File path", self.FileName, self.CurrentLineNumber)\r
         FfsFileObj.FileName = self.__Token\r
+        if FfsFileObj.FileName.replace('$(WORKSPACE)', '').find('$') == -1:\r
+            #check for file path\r
+            ErrorCode, ErrorInfo = PathClass(NormPath(FfsFileObj.FileName), GenFdsGlobalVariable.WorkSpaceDir).Validate()\r
+            if ErrorCode != 0:\r
+                EdkLogger.error("GenFds", ErrorCode, ExtraData=ErrorInfo)\r
 \r
         if FfsFileObj.FileType == 'EFI':\r
             self.__GetOptRomOverrides(FfsFileObj)\r