From 950f60c4eb622d5a800ee929c479bf8a3fd5b7ed Mon Sep 17 00:00:00 2001
From: edk2 dev <edk2.dev@edk2.org>
Date: Tue, 16 Feb 2016 10:47:30 +0800
Subject: 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)
---
 BaseTools/Source/Python/BPDG/BPDG.py        |  6 +++---
 BaseTools/Source/Python/BPDG/StringTable.py | 14 +++++++-------
 2 files changed, 10 insertions(+), 10 deletions(-)

(limited to 'BaseTools/Source/Python/BPDG')

diff --git a/BaseTools/Source/Python/BPDG/BPDG.py b/BaseTools/Source/Python/BPDG/BPDG.py
index b12403139d..08e29f055a 100644
--- a/BaseTools/Source/Python/BPDG/BPDG.py
+++ b/BaseTools/Source/Python/BPDG/BPDG.py
@@ -6,7 +6,7 @@
 #  file of PCD layout for use during the build when the platform integrator selects to use 
 #  automatic offset calculation.
 #
-#  Copyright (c) 2010 - 2014, Intel Corporation. All rights reserved.<BR>
+#  Copyright (c) 2010 - 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
@@ -33,7 +33,7 @@ import StringTable as st
 import GenVpd
 
 PROJECT_NAME       = st.LBL_BPDG_LONG_UNI
-VERSION            = (st.LBL_BPDG_VERSION + " " + gBUILD_VERSION)
+VERSION            = (st.LBL_BPDG_VERSION + " Build " + gBUILD_VERSION)
 
 ## Tool entrance method
 #
@@ -91,7 +91,7 @@ def MyOptionParser():
     #
     # Process command line firstly.
     #
-    parser = OptionParser(version="%s - Version %s\n" % (PROJECT_NAME, VERSION),
+    parser = OptionParser(version="%s - Version %s" % (PROJECT_NAME, VERSION),
                           description='',
                           prog='BPDG',
                           usage=st.LBL_BPDG_USAGE
diff --git a/BaseTools/Source/Python/BPDG/StringTable.py b/BaseTools/Source/Python/BPDG/StringTable.py
index a661da0f94..56b64b60ff 100644
--- a/BaseTools/Source/Python/BPDG/StringTable.py
+++ b/BaseTools/Source/Python/BPDG/StringTable.py
@@ -1,7 +1,7 @@
 ## @file
 # This file is used to define strings used in the BPDG tool
 #
-# Copyright (c) 2010, Intel Corporation. All rights reserved.<BR>
+# Copyright (c) 2010 - 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
@@ -32,7 +32,7 @@ MAP_FILE_COMMENT_TEMPLATE = \
 #
 #  This file lists all VPD informations for a platform fixed/adjusted by BPDG tool.
 # 
-# Copyright (c) 2010, Intel Corporation. All rights reserved.<BR>
+# Copyright (c) 2010 -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
@@ -46,14 +46,14 @@ MAP_FILE_COMMENT_TEMPLATE = \
 
 
 LBL_BPDG_LONG_UNI           = (u"Intel(r) Binary Product Data Generation Tool (Intel(r) BPDG)")
-LBL_BPDG_VERSION            = (u"0.1")
+LBL_BPDG_VERSION            = (u"1.0")
 LBL_BPDG_USAGE              = \
 (
-"""
-BPDG options -o Filename.bin -m Filename.map Filename.txt
-Intel(r) Binary Product Data Generation Tool (Intel(r) BPDG)
-Copyright (c) 2010 Intel Corporation All Rights Reserved.
+"""BPDG options -o Filename.bin -m Filename.map Filename.txt
+Copyright (c) 2010 - 2016, Intel Corporation All Rights Reserved.
 
+  Intel(r) Binary Product Data Generation Tool (Intel(r) BPDG)
+  
 Required Flags:
   -o BIN_FILENAME, --vpd-filename=BIN_FILENAME
             Specify the file name for the VPD binary file
-- 
cgit v1.2.3