BaseTools-Source: Update displayed version information

Standardize the --version and --help text command-line options

Updated tools to correctly display the Build number when using command-line
option --version and exit successfully after termination.
Ecc was also updated to print informational messages after the options are
parsed.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Larry Hauch <larry.hauch@intel.com>
Reviewed-by: Erik Bjorge <erik.c.bjorge@intel.com>
(cherry picked from commit fbf2338143952da2c63241e51379504a15aa3ea9)

1 files changed, 5 insertions, 6 deletions

diff --git a/BaseTools/Source/Python/Ecc/Ecc.py b/BaseTools/Source/Python/Ecc/Ecc.py
index c2ad4faff4..3fd4f2043b 100644
--- a/BaseTools/Source/Python/Ecc/Ecc.py
+++ b/BaseTools/Source/Python/Ecc/Ecc.py
@@ -1,7 +1,7 @@
 ## @file

 # This file is used to be the main entrance of ECC tool

 #

-# Copyright (c) 2009 - 2014, Intel Corporation. All rights reserved.<BR>

+# Copyright (c) 2009 - 2016, Intel Corporation. All rights reserved.<BR>
 # This program and the accompanying materials

 # are licensed and made available under the terms and conditions of the BSD License

 # which accompanies this distribution.  The full text of the license may be found at

@@ -49,9 +49,9 @@ from Common.MultipleWorkspace import MultipleWorkspace as mws
 class Ecc(object):

     def __init__(self):

         # Version and Copyright

-        self.VersionNumber = ("0.01" + " " + gBUILD_VERSION)

+        self.VersionNumber = ("1.0" + " Build " + gBUILD_VERSION)
         self.Version = "%prog Version " + self.VersionNumber

-        self.Copyright = "Copyright (c) 2009 - 2010, Intel Corporation  All rights reserved."

+        self.Copyright = "Copyright (c) 2009 - 2016, Intel Corporation  All rights reserved."
 

         self.InitDefaultConfigIni()

         self.OutputFile = 'output.txt'

@@ -65,6 +65,7 @@ class Ecc(object):
 

         # Parse the options and args

         self.ParseOption()

+        EdkLogger.info(time.strftime("%H:%M:%S, %b.%d %Y ", time.localtime()) + "[00:00]" + "\n")
         

         #

         # Check EFI_SOURCE (Edk build convention). EDK_SOURCE will always point to ECP

@@ -104,7 +105,7 @@ class Ecc(object):
         GlobalData.gGlobalDefines["EDK_SOURCE"] = EdkSourceDir

         GlobalData.gGlobalDefines["ECP_SOURCE"] = EcpSourceDir

         

-        

+        EdkLogger.info("Loading ECC configuration ... done")
         # Generate checkpoints list

         EccGlobalData.gConfig = Configuration(self.ConfigFile)

 

@@ -327,7 +328,6 @@ class Ecc(object):
     # Parse options

     #

     def ParseOption(self):

-        EdkLogger.quiet("Loading ECC configuration ... done")

         (Options, Target) = self.EccOptionParser()

 

         if Options.Workspace:

@@ -437,7 +437,6 @@ if __name__ == '__main__':
     # Initialize log system

     EdkLogger.Initialize()

     EdkLogger.IsRaiseError = False

-    EdkLogger.quiet(time.strftime("%H:%M:%S, %b.%d %Y ", time.localtime()) + "[00:00]" + "\n")

 

     StartTime = time.clock()

     Ecc = Ecc()