Sync BaseTools Branch (version r2323) to EDKII main trunk.

Signed-off-by: lgao4


git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@12379 6f19259b-4bc3-4df7-8a09-765794883524

1 files changed, 15 insertions, 4 deletions

diff --git a/BaseTools/Source/Python/GenFds/FdfParser.py b/BaseTools/Source/Python/GenFds/FdfParser.py
index c4b3f273f..6a9e5b7b4 100644
--- a/BaseTools/Source/Python/GenFds/FdfParser.py
+++ b/BaseTools/Source/Python/GenFds/FdfParser.py
@@ -45,6 +45,7 @@ from Common.BuildToolError import *
 from Common import EdkLogger

 from Common.Misc import PathClass

 from Common.String import NormPath

+from Common import GlobalData

 

 import re

 import os

@@ -2416,10 +2417,20 @@ class FdfParser:
         else:

             FfsFileObj.FileName = self.__Token

             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)

+                #

+                # For file in OUTPUT_DIRECTORY will not check whether it exist or not at AutoGen phase.

+                #

+                if not GlobalData.gAutoGenPhase:

+                    #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)

+                else:

+                    if not InputMacroDict["OUTPUT_DIRECTORY"] in FfsFileObj.FileName:

+                        #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)