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

Signed-off-by: lgao4
Reviewed-by: gikidy


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

BaseTools/Source/Python/Eot/Eot.py

@@ -28,6 +28,7 @@ from FvImage import *
 from array import array
 from Report import Report
 from Common.Misc import ParseConsoleLog
+from Common.BuildVersion import gBUILD_VERSION
 from Parser import ConvertGuid
 
 ## Class Eot
@@ -45,7 +46,7 @@ class Eot(object):
                  IncludeDirList=None, DecFileList=None, GuidList=None, LogFile=None,
                  FvFileList="", MapFileList="", Report='Report.html', Dispatch=None):
         # Version and Copyright
-        self.VersionNumber = "0.02"
+        self.VersionNumber = ("0.02" + " " + gBUILD_VERSION)
         self.Version = "%prog Version " + self.VersionNumber
         self.Copyright = "Copyright (c) 2008 - 2010, Intel Corporation  All rights reserved."
         self.Report = Report

BaseTools/Source/Python/Eot/Parser.py

@@ -49,11 +49,11 @@ def PreProcess(Filename, MergeMultipleLines = True, LineNo = -1):
     for Line in open(Filename, 'r'):
         Line = Line.strip()
         # Remove comment block
-        if Line.find(TAB_COMMENT_R8_START) > -1:
-            ReservedLine = GetSplitValueList(Line, TAB_COMMENT_R8_START, 1)[0]
+        if Line.find(TAB_COMMENT_EDK_START) > -1:
+            ReservedLine = GetSplitValueList(Line, TAB_COMMENT_EDK_START, 1)[0]
             IsFindBlockComment = True
-        if Line.find(TAB_COMMENT_R8_END) > -1:
-            Line = ReservedLine + GetSplitValueList(Line, TAB_COMMENT_R8_END, 1)[1]
+        if Line.find(TAB_COMMENT_EDK_END) > -1:
+            Line = ReservedLine + GetSplitValueList(Line, TAB_COMMENT_EDK_END, 1)[1]
             ReservedLine = ''
             IsFindBlockComment = False
         if IsFindBlockComment:

BaseTools/Source/Python/Eot/c.py

@@ -31,16 +31,6 @@ IncludePathListDict = {}
 ComplexTypeDict = {}
 SUDict = {}
 
-## GetIgnoredDirListPattern() method
-#
-#  Get the pattern of ignored direction list
-#
-#  @return p:    the pattern of ignored direction list
-#
-def GetIgnoredDirListPattern():
-    p = re.compile(r'.*[\\/](?:BUILD|INTELRESTRICTEDTOOLS|INTELRESTRICTEDPKG|PCCTS)[\\/].*')
-    return p
-
 ## GetFuncDeclPattern() method
 #
 #  Get the pattern of function declaration