BaseTools: remove including Base.h if the module type is not BASE

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

diff --git a/BaseTools/Source/Python/AutoGen/StrGather.py b/BaseTools/Source/Python/AutoGen/StrGather.py
index e6f10142cb665af0de537cc94ffcce37ffc7a03b..ce8866f480d501b5646bbcac73ba912323ebf859 100644 (file)
--- a/BaseTools/Source/Python/AutoGen/StrGather.py
+++ b/BaseTools/Source/Python/AutoGen/StrGather.py
@@ -124,22 +124,6 @@ def DecToHexList(Dec, Digit = 8):
 def AscToHexList(Ascii):\r
     return ['0x{0:02X}'.format(ord(Item)) for Item in Ascii]\r
 \r
-## Create header of .h file\r
-#\r
-# Create a header of .h file\r
-#\r
-# @param BaseName: The basename of strings\r
-#\r
-# @retval Str:     A string for .h file header\r
-#\r
-def CreateHFileHeader(BaseName):\r
-    Str = ''\r
-    for Item in H_C_FILE_HEADER:\r
-        Str = WriteLine(Str, Item)\r
-    Str = WriteLine(Str, '#ifndef _' + BaseName.upper() + '_STRINGS_DEFINE_H_')\r
-    Str = WriteLine(Str, '#define _' + BaseName.upper() + '_STRINGS_DEFINE_H_')\r
-    return Str\r
-\r
 ## Create content of .h file\r
 #\r
 # Create content of .h file\r
@@ -166,7 +150,7 @@ def CreateHFileContent(BaseName, UniObjectClass, IsCompatibleMode, UniGenCFlag):
         Name = StringItem.StringName\r
         Token = StringItem.Token\r
         Referenced = StringItem.Referenced\r
-        if Name != None:\r
+        if Name is not None:\r
             Line = ''\r
             if Referenced == True:\r
                 if (ValueStartPtr - len(DEFINE_STR + Name)) <= 0:\r
@@ -204,19 +188,6 @@ def CreateHFile(BaseName, UniObjectClass, IsCompatibleMode, UniGenCFlag):
 \r
     return HFile\r
 \r
-## Create header of .c file\r
-#\r
-# Create a header of .c file\r
-#\r
-# @retval Str:     A string for .c file header\r
-#\r
-def CreateCFileHeader():\r
-    Str = ''\r
-    for Item in H_C_FILE_HEADER:\r
-        Str = WriteLine(Str, Item)\r
-\r
-    return Str\r
-\r
 ## Create a buffer to store all items in an array\r
 #\r
 # @param BinBuffer   Buffer to contain Binary data.\r
@@ -287,7 +258,7 @@ def GetFilteredLanguage(UniLanguageList, LanguageFilterList):
         # first check for exact match\r
         if Language in UniLanguageList:\r
             if Language not in UniLanguageListFiltered:\r
-                UniLanguageListFiltered += [Language]\r
+                UniLanguageListFiltered.append(Language)\r
         # find the first one with the same/equivalent primary tag\r
         else:\r
             if Language.find('-') != -1:\r
@@ -309,7 +280,7 @@ def GetFilteredLanguage(UniLanguageList, LanguageFilterList):
 \r
                 if PrimaryTag == UniLanguagePrimaryTag:\r
                     if UniLanguage not in UniLanguageListFiltered:\r
-                        UniLanguageListFiltered += [UniLanguage]\r
+                        UniLanguageListFiltered.append(UniLanguage)\r
                     break\r
             else:\r
                 # Here is rule 3 for "get best language"\r
@@ -321,10 +292,10 @@ def GetFilteredLanguage(UniLanguageList, LanguageFilterList):
                     for UniLanguage in UniLanguageList:\r
                         if UniLanguage.startswith('en-') or UniLanguage.startswith('eng-'):\r
                             if UniLanguage not in UniLanguageListFiltered:\r
-                                UniLanguageListFiltered += [UniLanguage]\r
+                                UniLanguageListFiltered.append(UniLanguage)\r
                             break\r
                     else:\r
-                        UniLanguageListFiltered += [DefaultTag]\r
+                        UniLanguageListFiltered.append(DefaultTag)\r
     return  UniLanguageListFiltered\r
 \r
 \r
@@ -493,7 +464,6 @@ def CreateCFileEnd():
 #\r
 def CreateCFile(BaseName, UniObjectClass, IsCompatibleMode, FilterInfo):\r
     CFile = ''\r
-    #CFile = WriteLine(CFile, CreateCFileHeader())\r
     CFile = WriteLine(CFile, CreateCFileContent(BaseName, UniObjectClass, IsCompatibleMode, None, FilterInfo))\r
     CFile = WriteLine(CFile, CreateCFileEnd())\r
     return CFile\r
@@ -508,11 +478,11 @@ def CreateCFile(BaseName, UniObjectClass, IsCompatibleMode, FilterInfo):
 # @retval FileList:    A list of all files found\r
 #\r
 def GetFileList(SourceFileList, IncludeList, SkipList):\r
-    if IncludeList == None:\r
+    if IncludeList is None:\r
         EdkLogger.error("UnicodeStringGather", AUTOGEN_ERROR, "Include path for unicode file is not defined")\r
 \r
     FileList = []\r
-    if SkipList == None:\r
+    if SkipList is None:\r
         SkipList = []\r
 \r
     for File in SourceFileList:\r