BaseTools: Report more clear error message when PCD type mismatch

[mirror_edk2.git] / BaseTools / Source / Python / AutoGen / UniClassObject.py

diff --git a/BaseTools/Source/Python/AutoGen/UniClassObject.py b/BaseTools/Source/Python/AutoGen/UniClassObject.py
index 4e16afec5c28932cf9a65312197c078ab8cbae8c..54b6fb22a08ad6881b78f9d5ec7fb8250e430176 100644 (file)
--- a/BaseTools/Source/Python/AutoGen/UniClassObject.py
+++ b/BaseTools/Source/Python/AutoGen/UniClassObject.py
@@ -118,8 +118,6 @@ LangConvTable = {'eng':'en', 'fra':'fr', \
 # @retval LangName:  Valid lanugage code in RFC 4646 format or None\r
 #\r
 def GetLanguageCode(LangName, IsCompatibleMode, File):\r
-    global LangConvTable\r
-\r
     length = len(LangName)\r
     if IsCompatibleMode:\r
         if length == 3 and LangName.isalpha():\r
@@ -255,7 +253,7 @@ class UniFileClassObject(object):
         Lang = distutils.util.split_quoted((Line.split(u"//")[0]))\r
         if len(Lang) != 3:\r
             try:\r
-                FileIn = self.OpenUniFile(LongFilePath(File.Path))\r
+                FileIn = UniFileClassObject.OpenUniFile(LongFilePath(File.Path))\r
             except UnicodeError, X:\r
                 EdkLogger.error("build", FILE_READ_FAILURE, "File read failure: %s" % str(X), ExtraData=File);\r
             except:\r
@@ -299,7 +297,8 @@ class UniFileClassObject(object):
                     self.OrderedStringDict[LangName][Item.StringName] = len(self.OrderedStringList[LangName]) - 1\r
         return True\r
 \r
-    def OpenUniFile(self, FileName):\r
+    @staticmethod\r
+    def OpenUniFile(FileName):\r
         #\r
         # Read file\r
         #\r
@@ -318,14 +317,15 @@ class UniFileClassObject(object):
             FileIn.startswith(codecs.BOM_UTF16_LE)):\r
             Encoding = 'utf-16'\r
 \r
-        self.VerifyUcs2Data(FileIn, FileName, Encoding)\r
+        UniFileClassObject.VerifyUcs2Data(FileIn, FileName, Encoding)\r
 \r
         UniFile = StringIO.StringIO(FileIn)\r
         Info = codecs.lookup(Encoding)\r
         (Reader, Writer) = (Info.streamreader, Info.streamwriter)\r
         return codecs.StreamReaderWriter(UniFile, Reader, Writer)\r
 \r
-    def VerifyUcs2Data(self, FileIn, FileName, Encoding):\r
+    @staticmethod\r
+    def VerifyUcs2Data(FileIn, FileName, Encoding):\r
         Ucs2Info = codecs.lookup('ucs-2')\r
         #\r
         # Convert to unicode\r
@@ -392,7 +392,7 @@ class UniFileClassObject(object):
             EdkLogger.error("Unicode File Parser", FILE_NOT_FOUND, ExtraData=File.Path)\r
 \r
         try:\r
-            FileIn = self.OpenUniFile(LongFilePath(File.Path))\r
+            FileIn = UniFileClassObject.OpenUniFile(LongFilePath(File.Path))\r
         except UnicodeError, X:\r
             EdkLogger.error("build", FILE_READ_FAILURE, "File read failure: %s" % str(X), ExtraData=File.Path);\r
         except:\r