Sync EDKII BaseTools to BaseTools project r2000

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

21 files changed, 35 insertions, 2 deletions

diff --git a/BaseTools/Bin/Win32/BootSectImage.exe b/BaseTools/Bin/Win32/BootSectImage.exe
index 244f0c5de..433d8de59 100755
--- a/BaseTools/Bin/Win32/BootSectImage.exe
+++ b/BaseTools/Bin/Win32/BootSectImage.exe
diff --git a/BaseTools/Bin/Win32/EfiLdrImage.exe b/BaseTools/Bin/Win32/EfiLdrImage.exe
index 3881789d3..ab8e43856 100755
--- a/BaseTools/Bin/Win32/EfiLdrImage.exe
+++ b/BaseTools/Bin/Win32/EfiLdrImage.exe
diff --git a/BaseTools/Bin/Win32/EfiRom.exe b/BaseTools/Bin/Win32/EfiRom.exe
index b3bde7eac..7c2fd61ad 100755
--- a/BaseTools/Bin/Win32/EfiRom.exe
+++ b/BaseTools/Bin/Win32/EfiRom.exe
diff --git a/BaseTools/Bin/Win32/GenBootSector.exe b/BaseTools/Bin/Win32/GenBootSector.exe
index 061d5b683..3e37a4fa7 100755
--- a/BaseTools/Bin/Win32/GenBootSector.exe
+++ b/BaseTools/Bin/Win32/GenBootSector.exe
diff --git a/BaseTools/Bin/Win32/GenCrc32.exe b/BaseTools/Bin/Win32/GenCrc32.exe
index 3896e63b2..bd6ba314d 100755
--- a/BaseTools/Bin/Win32/GenCrc32.exe
+++ b/BaseTools/Bin/Win32/GenCrc32.exe
diff --git a/BaseTools/Bin/Win32/GenFds.exe b/BaseTools/Bin/Win32/GenFds.exe
index 64e6673f7..b4e55aed8 100755
--- a/BaseTools/Bin/Win32/GenFds.exe
+++ b/BaseTools/Bin/Win32/GenFds.exe
diff --git a/BaseTools/Bin/Win32/GenFfs.exe b/BaseTools/Bin/Win32/GenFfs.exe
index accb54930..914875176 100755
--- a/BaseTools/Bin/Win32/GenFfs.exe
+++ b/BaseTools/Bin/Win32/GenFfs.exe
diff --git a/BaseTools/Bin/Win32/GenFv.exe b/BaseTools/Bin/Win32/GenFv.exe
index 92c2b2549..fade8eee6 100755
--- a/BaseTools/Bin/Win32/GenFv.exe
+++ b/BaseTools/Bin/Win32/GenFv.exe
diff --git a/BaseTools/Bin/Win32/GenFw.exe b/BaseTools/Bin/Win32/GenFw.exe
index 3ae5b6a9a..0130d6396 100755
--- a/BaseTools/Bin/Win32/GenFw.exe
+++ b/BaseTools/Bin/Win32/GenFw.exe
diff --git a/BaseTools/Bin/Win32/GenPage.exe b/BaseTools/Bin/Win32/GenPage.exe
index 6f707b277..5850eede9 100755
--- a/BaseTools/Bin/Win32/GenPage.exe
+++ b/BaseTools/Bin/Win32/GenPage.exe
diff --git a/BaseTools/Bin/Win32/GenSec.exe b/BaseTools/Bin/Win32/GenSec.exe
index a8a9927fe..d3eb98e31 100755
--- a/BaseTools/Bin/Win32/GenSec.exe
+++ b/BaseTools/Bin/Win32/GenSec.exe
diff --git a/BaseTools/Bin/Win32/GenVtf.exe b/BaseTools/Bin/Win32/GenVtf.exe
index 0f6889b32..98f677a76 100755
--- a/BaseTools/Bin/Win32/GenVtf.exe
+++ b/BaseTools/Bin/Win32/GenVtf.exe
diff --git a/BaseTools/Bin/Win32/LzmaCompress.exe b/BaseTools/Bin/Win32/LzmaCompress.exe
index 640254ad0..34f753c89 100755
--- a/BaseTools/Bin/Win32/LzmaCompress.exe
+++ b/BaseTools/Bin/Win32/LzmaCompress.exe
diff --git a/BaseTools/Bin/Win32/Split.exe b/BaseTools/Bin/Win32/Split.exe
index bccddc6a8..b73d3d1a3 100755
--- a/BaseTools/Bin/Win32/Split.exe
+++ b/BaseTools/Bin/Win32/Split.exe
diff --git a/BaseTools/Bin/Win32/TianoCompress.exe b/BaseTools/Bin/Win32/TianoCompress.exe
index 6339837c1..728af8b25 100755
--- a/BaseTools/Bin/Win32/TianoCompress.exe
+++ b/BaseTools/Bin/Win32/TianoCompress.exe
diff --git a/BaseTools/Bin/Win32/VfrCompile.exe b/BaseTools/Bin/Win32/VfrCompile.exe
index 375fd67c4..7885c5656 100755
--- a/BaseTools/Bin/Win32/VfrCompile.exe
+++ b/BaseTools/Bin/Win32/VfrCompile.exe
diff --git a/BaseTools/Bin/Win32/VolInfo.exe b/BaseTools/Bin/Win32/VolInfo.exe
index f35ed7d29..3a6b1e946 100755
--- a/BaseTools/Bin/Win32/VolInfo.exe
+++ b/BaseTools/Bin/Win32/VolInfo.exe
diff --git a/BaseTools/Bin/Win32/build.exe b/BaseTools/Bin/Win32/build.exe
index 5a8a65892..d73c4faee 100755
--- a/BaseTools/Bin/Win32/build.exe
+++ b/BaseTools/Bin/Win32/build.exe
diff --git a/BaseTools/Conf/tools_def.template b/BaseTools/Conf/tools_def.template
index fa0c48d6e..d776ab22d 100644
--- a/BaseTools/Conf/tools_def.template
+++ b/BaseTools/Conf/tools_def.template
@@ -3125,7 +3125,7 @@ RELEASE_ICC11x86xASL_IPF_DLINK_FLAGS              = /NOLOGO /NODEFAULTLIB /LTCG
 *_MYTOOLS_IA32_ASLCC_PATH           = DEF(VS2008_BIN)\cl.exe

 *_MYTOOLS_IA32_ASLPP_PATH           = DEF(VS2008_BIN)\cl.exe

 *_MYTOOLS_IA32_ASLDLINK_PATH        = DEF(VS2008_BIN)\link.exe

-*_MYTOOLS_IA32_RC_PATH              = DEF(VS2008_BIN)\rc.exe

+*_MYTOOLS_IA32_RC_PATH              = DEF(WINSDK_BIN)\rc.exe

 

   DEBUG_MYTOOLS_IA32_CC_FLAGS            = /nologo /c /WX /GS- /W4 /Gs32768 /Gy /D UNICODE /O1ib2 /GL /FIAutoGen.h /EHs-c- /GR- /GF /Zi /Gm

 RELEASE_MYTOOLS_IA32_CC_FLAGS            = /nologo /c /WX /GS- /W4 /Gs32768 /Gy /D UNICODE /O1ib2 /GL /FIAutoGen.h /EHs-c- /GR- /GF

@@ -3150,7 +3150,7 @@ RELEASE_MYTOOLS_IA32_DLINK_FLAGS         = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /O
 *_MYTOOLS_X64_ASLCC_PATH            = DEF(VS2008_BINX64)\cl.exe

 *_MYTOOLS_X64_ASLPP_PATH            = DEF(VS2008_BINX64)\cl.exe

 *_MYTOOLS_X64_ASLDLINK_PATH         = DEF(VS2008_BINX64)\link.exe

-*_MYTOOLS_X64_RC_PATH               = DEF(VS2008_BIN)\rc.exe

+*_MYTOOLS_X64_RC_PATH               = DEF(WINSDK_BIN)\rc.exe

 

   DEBUG_MYTOOLS_X64_CC_FLAGS             = /nologo /c /WX /GS- /W4 /Gs32768 /Gy /D UNICODE /O1ib2 /GL /FIAutoGen.h /EHs-c- /GR- /GF /Zi /Gm

 RELEASE_MYTOOLS_X64_CC_FLAGS             = /nologo /c /WX /GS- /W4 /Gs32768 /Gy /D UNICODE /O1ib2 /GL /FIAutoGen.h /EHs-c- /GR- /GF

diff --git a/BaseTools/Source/Python/GenFds/FdfParser.py b/BaseTools/Source/Python/GenFds/FdfParser.py
index c4358cf47..83b58bcd4 100644
--- a/BaseTools/Source/Python/GenFds/FdfParser.py
+++ b/BaseTools/Source/Python/GenFds/FdfParser.py
@@ -3532,6 +3532,11 @@ class FdfParser:
                 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 @@ class FdfParser:
             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 @@ class FdfParser:
             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 @@ class FdfParser:
         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 @@ class FdfParser:
         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)

diff --git a/BaseTools/Source/Python/GenFds/Vtf.py b/BaseTools/Source/Python/GenFds/Vtf.py
index 2bea9346c..e7e36491d 100644
--- a/BaseTools/Source/Python/GenFds/Vtf.py
+++ b/BaseTools/Source/Python/GenFds/Vtf.py
@@ -67,6 +67,14 @@ class Vtf (VtfClassObject):
         FvList = self.GetFvList()

         self.BsfInfName = os.path.join(GenFdsGlobalVariable.FvDir, self.UiName + '.inf')

         BsfInf = open (self.BsfInfName, 'w+')

+        if self.ResetBin != None:

+            BsfInf.writelines ("[OPTIONS]" + T_CHAR_LF)

+            BsfInf.writelines ("IA32_RST_BIN"     + \

+                               " = "              + \

+                               GenFdsGlobalVariable.MacroExtend(GenFdsGlobalVariable.ReplaceWorkspaceMacro(self.ResetBin)) + \

+                               T_CHAR_LF )

+            BsfInf.writelines (T_CHAR_LF )

+        

         BsfInf.writelines ("[COMPONENTS]" + T_CHAR_LF)

 

         for ComponentObj in self.ComponentStatementList :