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/UPT/UPT.py

@@ -43,6 +43,7 @@ import RmPkg
 from Library.Misc import CheckEnvVariable
 from Library import GlobalData
 from Core.IpiDb import IpiDatabase
+from Common.BuildVersion import gBUILD_VERSION
 
 ##
 # Version and Copyright
@@ -90,7 +91,7 @@ def SetLogLevel(Opt):
 def Main():
     Logger.Initialize()
 
-    Parser = OptionParser(version=MSG_VERSION, description=MSG_DESCRIPTION,
+    Parser = OptionParser(version=(MSG_VERSION + ' ' + gBUILD_VERSION), description=MSG_DESCRIPTION,
                           prog="UPT.exe", usage=MSG_USAGE)
 
     Parser.add_option("-d", "--debug", action="store", type="int", dest="debug_level", help=ST.HLP_PRINT_DEBUG_INFO)