Avoid the use of "%prog" in common module.

git-svn-id: https://buildtools.tianocore.org/svn/buildtools/trunk/BaseTools@623 7335b38e-4728-0410-8992-fb3ffe349368

diff --git a/Source/Python/Common/MigrationUtilities.py b/Source/Python/Common/MigrationUtilities.py
index b9c4922..db96466 100644 (file)
--- a/Source/Python/Common/MigrationUtilities.py
+++ b/Source/Python/Common/MigrationUtilities.py
@@ -492,6 +492,7 @@ def GetTextFileInfo(FileName, TagTuple):
         \r
     return ValueTuple\r
 \r
+\r
 ## Return a value tuple matching information in an XML fle.\r
 #\r
 # Parse the XML file and return a value tuple corresponding to an input tag\r
@@ -506,10 +507,6 @@ def GetXmlFileInfo(FileName, TagTuple):
     XmlDom = XmlParseFile(FileName)\r
     return tuple([XmlElement(XmlDom, XmlTag) for XmlTag in TagTuple])\r
 \r
-# Version and Copyright\r
-__version_number__ = "1.0"\r
-__version__ = "%prog Version " + __version_number__\r
-__copyright__ = "Copyright (c) 2007, Intel Corporation. All rights reserved."\r
 \r
 ## Parse migration command line options\r
 #\r
@@ -521,11 +518,13 @@ __copyright__ = "Copyright (c) 2007, Intel Corporation. All rights reserved."
 # @retval Options            A optparse object containing the parsed options.\r
 # @retval InputFile          Path of an source file to be migrated.\r
 #\r
-def MigrationOptionParser(Source, Destinate):\r
+def MigrationOptionParser(Source, Destinate, ToolName, VersionNumber = 1.0):\r
     # use clearer usage to override default usage message\r
-    UsageString = "%prog [-a] [-o <output_file>] <input_file>"\r
-\r
-    Parser = OptionParser(description=__copyright__, version=__version__, usage=UsageString)\r
+    UsageString = "%s [-a] [-v|-q] [-o <output_file>] <input_file>" % ToolName\r
+    Version = "%s Version %.2f" % (ToolName, VersionNumber)\r
+    Copyright = "Copyright (c) 2007, Intel Corporation. All rights reserved."\r
+    \r
+    Parser = OptionParser(description=Copyright, version=Version, usage=UsageString)\r
     Parser.add_option("-o", "--output", dest="OutputFile", help="The name of the %s file to be created." % Destinate)\r
     Parser.add_option("-a", "--auto", dest="AutoWrite", action="store_true", default=False, help="Automatically create the %s file using the name of the %s file and replacing file extension" % (Source, Destinate))\r
     Parser.add_option("-q", "--quiet", action="store_true", type=None, help="Disable all messages except FATAL ERRORS.")\r
@@ -534,9 +533,9 @@ def MigrationOptionParser(Source, Destinate):
     Options, Args = Parser.parse_args()\r
 \r
     # Set logging level\r
-    if Options.verbose != None:\r
+    if Options.verbose:\r
         EdkLogger.setLevel(EdkLogger.VERBOSE)\r
-    elif Options.quiet != None:\r
+    elif Options.quiet:\r
         EdkLogger.setLevel(EdkLogger.QUIET)\r
     else:\r
         EdkLogger.setLevel(EdkLogger.INFO)\r

diff --git a/Source/Python/msa2inf/Msa2Inf.py b/Source/Python/msa2inf/Msa2Inf.py
index 6f047da..5873b1d 100644 (file)
--- a/Source/Python/msa2inf/Msa2Inf.py
+++ b/Source/Python/msa2inf/Msa2Inf.py
@@ -31,7 +31,7 @@ from ConvertModule import ConvertMsaModuleToInfModule
 #\r
 def Main():\r
     try:\r
-        Options, InputFile = MigrationOptionParser("MSA", "INF")\r
+        Options, InputFile = MigrationOptionParser("MSA", "INF", "%prog")\r
         Module = LoadMsa(InputFile)\r
         ConvertMsaModuleToInfModule(Module)\r
         StoreInf(Options.OutputFile, Module)\r

diff --git a/Source/Python/spd2dec/Spd2Dec.py b/Source/Python/spd2dec/Spd2Dec.py
index c767a42..46d0583 100644 (file)
--- a/Source/Python/spd2dec/Spd2Dec.py
+++ b/Source/Python/spd2dec/Spd2Dec.py
@@ -31,7 +31,7 @@ from ConvertPackage import ConvertSpdPackageToDecPackage
 #\r
 def Main():\r
     try:\r
-        Options, InputFile = MigrationOptionParser("SPD", "DEC")\r
+        Options, InputFile = MigrationOptionParser("SPD", "DEC", "%prog")\r
         Package = LoadSpd(InputFile)\r
         ConvertSpdPackageToDecPackage(Package)\r
         StoreDec(Options.OutputFile, Package)\r