SF.net SVN: edk2-buildtools:[1998] trunk/BaseTools/Source/Python/GenFds/ FdfParser.py

[<lg...@us...>]

Revision: 1998
          http://edk2-buildtools.svn.sourceforge.net/edk2-buildtools/?rev=1998&view=rev
Author:   lgao4
Date:     2010-07-26 09:33:47 +0000 (Mon, 26 Jul 2010)

Log Message:
-----------
Check file path specified in VFT section and OptionRom section.

Modified Paths:
--------------
    trunk/BaseTools/Source/Python/GenFds/FdfParser.py

Modified: trunk/BaseTools/Source/Python/GenFds/FdfParser.py
===================================================================
--- trunk/BaseTools/Source/Python/GenFds/FdfParser.py	2010-07-20 08:08:05 UTC (rev 1997)
+++ trunk/BaseTools/Source/Python/GenFds/FdfParser.py	2010-07-26 09:33:47 UTC (rev 1998)
@@ -3532,6 +3532,11 @@
                 raise Warning("expected Reset file", self.FileName, self.CurrentLineNumber)
 
             VtfObj.ResetBin = self.__Token
+            if VtfObj.ResetBin.replace('$(WORKSPACE)', '').find('$') == -1:
+                #check for file path
+                ErrorCode, ErrorInfo = PathClass(NormPath(VtfObj.ResetBin), GenFdsGlobalVariable.WorkSpaceDir).Validate()
+                if ErrorCode != 0:
+                    EdkLogger.error("GenFds", ErrorCode, ExtraData=ErrorInfo)
 
         while self.__GetComponentStatement(VtfObj):
             pass
@@ -3634,6 +3639,11 @@
             raise Warning("expected Component file", self.FileName, self.CurrentLineNumber)
 
         CompStatementObj.CompBin = self.__Token
+        if CompStatementObj.CompBin != '-' and CompStatementObj.CompBin.replace('$(WORKSPACE)', '').find('$') == -1:
+            #check for file path
+            ErrorCode, ErrorInfo = PathClass(NormPath(CompStatementObj.CompBin), GenFdsGlobalVariable.WorkSpaceDir).Validate()
+            if ErrorCode != 0:
+                EdkLogger.error("GenFds", ErrorCode, ExtraData=ErrorInfo)
 
         if not self.__IsKeyword("COMP_SYM"):
             raise Warning("expected COMP_SYM", self.FileName, self.CurrentLineNumber)
@@ -3645,6 +3655,11 @@
             raise Warning("expected Component symbol file", self.FileName, self.CurrentLineNumber)
 
         CompStatementObj.CompSym = self.__Token
+        if CompStatementObj.CompSym != '-' and CompStatementObj.CompSym.replace('$(WORKSPACE)', '').find('$') == -1:
+            #check for file path
+            ErrorCode, ErrorInfo = PathClass(NormPath(CompStatementObj.CompSym), GenFdsGlobalVariable.WorkSpaceDir).Validate()
+            if ErrorCode != 0:
+                EdkLogger.error("GenFds", ErrorCode, ExtraData=ErrorInfo)
 
         if not self.__IsKeyword("COMP_SIZE"):
             raise Warning("expected COMP_SIZE", self.FileName, self.CurrentLineNumber)
@@ -3722,6 +3737,11 @@
         if not self.__GetNextToken():
             raise Warning("expected INF file path", self.FileName, self.CurrentLineNumber)
         ffsInf.InfFileName = self.__Token
+        if ffsInf.InfFileName.replace('$(WORKSPACE)', '').find('$') == -1:
+            #check for file path
+            ErrorCode, ErrorInfo = PathClass(NormPath(ffsInf.InfFileName), GenFdsGlobalVariable.WorkSpaceDir).Validate()
+            if ErrorCode != 0:
+                EdkLogger.error("GenFds", ErrorCode, ExtraData=ErrorInfo)
 
         if not ffsInf.InfFileName in self.Profile.InfList:
             self.Profile.InfList.append(ffsInf.InfFileName)
@@ -3814,6 +3834,11 @@
         if not self.__GetNextToken():
             raise Warning("expected File path", self.FileName, self.CurrentLineNumber)
         FfsFileObj.FileName = self.__Token
+        if FfsFileObj.FileName.replace('$(WORKSPACE)', '').find('$') == -1:
+            #check for file path
+            ErrorCode, ErrorInfo = PathClass(NormPath(FfsFileObj.FileName), GenFdsGlobalVariable.WorkSpaceDir).Validate()
+            if ErrorCode != 0:
+                EdkLogger.error("GenFds", ErrorCode, ExtraData=ErrorInfo)
 
         if FfsFileObj.FileType == 'EFI':
             self.__GetOptRomOverrides(FfsFileObj)


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.