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

2 files changed, 8 insertions, 2 deletions

diff --git a/BaseTools/Source/Python/Ecc/Ecc.py b/BaseTools/Source/Python/Ecc/Ecc.py
index e9a1c2a890..05dba2568b 100644
--- a/BaseTools/Source/Python/Ecc/Ecc.py
+++ b/BaseTools/Source/Python/Ecc/Ecc.py
@@ -27,6 +27,7 @@ from Common.DecClassObject import Dec
 from Common.DscClassObject import Dsc

 from Common.FdfClassObject import Fdf

 from Common.String import NormPath

+from Common.BuildVersion import gBUILD_VERSION

 from Common import BuildToolError

 import c

 import re, string

@@ -41,7 +42,7 @@ from Exception import *
 class Ecc(object):

     def __init__(self):

         # Version and Copyright

-        self.VersionNumber = "0.01"

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

         self.Version = "%prog Version " + self.VersionNumber

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

 

diff --git a/BaseTools/Source/Python/Ecc/c.py b/BaseTools/Source/Python/Ecc/c.py
index 5a8c1d13e7..4c831e0ff7 100644
--- a/BaseTools/Source/Python/Ecc/c.py
+++ b/BaseTools/Source/Python/Ecc/c.py
@@ -2539,7 +2539,12 @@ if __name__ == '__main__':
 #    EdkLogger.Initialize()

 #    EdkLogger.SetLevel(EdkLogger.QUIET)

 #    CollectSourceCodeDataIntoDB(sys.argv[1])

-    MsgList = CheckFuncHeaderDoxygenComments('C:\\Combo\\R9\\LakeportX64Dev\\FlashDevicePkg\\Library\\SpiFlashChipM25P64\\SpiFlashChipM25P64.c')

+    try:

+        test_file = sys.argv[1]

+    except IndexError, v:

+        print "Usage: %s filename" % sys.argv[0]

+        sys.exit(1)

+    MsgList = CheckFuncHeaderDoxygenComments(test_file)

     for Msg in MsgList:

         print Msg

     print 'Done!'