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

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

Revision: 1995
          http://edk2-buildtools.svn.sourceforge.net/edk2-buildtools/?rev=1995&view=rev
Author:   lgao4
Date:     2010-07-19 03:16:10 +0000 (Mon, 19 Jul 2010)

Log Message:
-----------
Don't check the case sensitive file path that uses MACRO. 

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-15 04:39:33 UTC (rev 1994)
+++ trunk/BaseTools/Source/Python/GenFds/FdfParser.py	2010-07-19 03:16:10 UTC (rev 1995)
@@ -2149,10 +2149,11 @@
         if not self.__GetNextToken():
             raise Warning("expected INF file path", self.FileName, self.CurrentLineNumber)
         ffsInf.InfFileName = self.__Token
-        #do case sensitive check for file path
-        ErrorCode, ErrorInfo = PathClass(NormPath(ffsInf.InfFileName), GenFdsGlobalVariable.WorkSpaceDir).Validate()
-        if ErrorCode != 0:
-            EdkLogger.error("GenFds", ErrorCode, ExtraData=ErrorInfo)
+        if ffsInf.InfFileName.replace('$(WORKSPACE)', '').find('$') == -1:
+            #do case sensitive 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)
@@ -2360,10 +2361,11 @@
             self.__GetSectionData( FfsFileObj, MacroDict)
         else:
             FfsFileObj.FileName = self.__Token
-            #do case sensitive check for file path
-            ErrorCode, ErrorInfo = PathClass(NormPath(FfsFileObj.FileName), GenFdsGlobalVariable.WorkSpaceDir).Validate()
-            if ErrorCode != 0:
-                EdkLogger.error("GenFds", ErrorCode, ExtraData=ErrorInfo)
+            if FfsFileObj.FileName.replace('$(WORKSPACE)', '').find('$') == -1:
+                #do case sensitive check for file path
+                ErrorCode, ErrorInfo = PathClass(NormPath(FfsFileObj.FileName), GenFdsGlobalVariable.WorkSpaceDir).Validate()
+                if ErrorCode != 0:
+                    EdkLogger.error("GenFds", ErrorCode, ExtraData=ErrorInfo)
 
         if not self.__IsToken( "}"):
             raise Warning("expected '}'", self.FileName, self.CurrentLineNumber)
@@ -2609,10 +2611,11 @@
                 if not self.__GetNextToken():
                     raise Warning("expected section file path", self.FileName, self.CurrentLineNumber)
                 DataSectionObj.SectFileName = self.__Token
-                #do case sensitive check for file path
-                ErrorCode, ErrorInfo = PathClass(NormPath(DataSectionObj.SectFileName), GenFdsGlobalVariable.WorkSpaceDir).Validate()
-                if ErrorCode != 0:
-                    EdkLogger.error("GenFds", ErrorCode, ExtraData=ErrorInfo)
+                if DataSectionObj.SectFileName.replace('$(WORKSPACE)', '').find('$') == -1:
+                    #do case sensitive check for file path
+                    ErrorCode, ErrorInfo = PathClass(NormPath(DataSectionObj.SectFileName), GenFdsGlobalVariable.WorkSpaceDir).Validate()
+                    if ErrorCode != 0:
+                        EdkLogger.error("GenFds", ErrorCode, ExtraData=ErrorInfo)
             else:
                 if not self.__GetCglSection(DataSectionObj):
                     return False


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