BaseTools: Clean up source files

[mirror_edk2.git] / BaseTools / Source / Python / UPT / Parser / InfBuildOptionSectionParser.py

diff --git a/BaseTools/Source/Python/UPT/Parser/InfBuildOptionSectionParser.py b/BaseTools/Source/Python/UPT/Parser/InfBuildOptionSectionParser.py
index 941641a8451310e42f8064c90862f9ab41d50ec5..43b6ee2e7f06e921443022fde970acc835bf38c2 100644 (file)
--- a/BaseTools/Source/Python/UPT/Parser/InfBuildOptionSectionParser.py
+++ b/BaseTools/Source/Python/UPT/Parser/InfBuildOptionSectionParser.py
@@ -1,11 +1,11 @@
 ## @file\r
-# This file contained the parser for BuildOption sections in INF file \r
+# This file contained the parser for BuildOption sections in INF file\r
 #\r
-# Copyright (c) 2011, Intel Corporation. All rights reserved.<BR>\r
+# Copyright (c) 2011 - 2018, Intel Corporation. All rights reserved.<BR>\r
 #\r
-# This program and the accompanying materials are licensed and made available \r
-# under the terms and conditions of the BSD License which accompanies this \r
-# distribution. The full text of the license may be found at \r
+# This program and the accompanying materials are licensed and made available\r
+# under the terms and conditions of the BSD License which accompanies this\r
+# distribution. The full text of the license may be found at\r
 # http://opensource.org/licenses/bsd-license.php\r
 #\r
 # THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
@@ -36,10 +36,10 @@ class InfBuildOptionSectionParser(InfParserSectionRoot):
     #\r
     #\r
     def InfBuildOptionParser(self, SectionString, InfSectionObject, FileName):\r
-        \r
+\r
         BuildOptionList = []\r
         SectionContent  = ''\r
-        \r
+\r
         if not GlobalData.gIS_BINARY_INF:\r
             ValueList       = []\r
             LineNo          = 0\r
@@ -49,24 +49,24 @@ class InfBuildOptionSectionParser(InfParserSectionRoot):
                 LineNo      = Line[1]\r
                 TailComments = ''\r
                 ReplaceFlag = False\r
-                \r
+\r
                 if LineContent.strip() == '':\r
-                    SectionContent += LineContent + DT.END_OF_LINE \r
-                    continue       \r
+                    SectionContent += LineContent + DT.END_OF_LINE\r
+                    continue\r
                 #\r
                 # Found Comment\r
                 #\r
                 if LineContent.strip().startswith(DT.TAB_COMMENT_SPLIT):\r
-                    SectionContent += LineContent + DT.END_OF_LINE \r
+                    SectionContent += LineContent + DT.END_OF_LINE\r
                     continue\r
-                \r
+\r
                 #\r
                 # Find Tail comment.\r
                 #\r
                 if LineContent.find(DT.TAB_COMMENT_SPLIT) > -1:\r
                     TailComments = LineContent[LineContent.find(DT.TAB_COMMENT_SPLIT):]\r
-                    LineContent = LineContent[:LineContent.find(DT.TAB_COMMENT_SPLIT)]               \r
-                \r
+                    LineContent = LineContent[:LineContent.find(DT.TAB_COMMENT_SPLIT)]\r
+\r
                 TokenList = GetSplitValueList(LineContent, DT.TAB_DEQUAL_SPLIT, 1)\r
                 if len(TokenList) == 2:\r
                     #\r
@@ -82,21 +82,21 @@ class InfBuildOptionSectionParser(InfParserSectionRoot):
                     if len(TokenList) == 2:\r
                         TokenList.append('False')\r
                     else:\r
-                        Logger.Error('InfParser', \r
+                        Logger.Error('InfParser',\r
                                      FORMAT_INVALID,\r
                                      ST.ERR_INF_PARSER_BUILD_OPTION_FORMAT_INVALID,\r
-                                     ExtraData=LineContent, \r
+                                     ExtraData=LineContent,\r
                                      File=FileName,\r
-                                     Line=LineNo)               \r
-                        \r
+                                     Line=LineNo)\r
+\r
                 ValueList[0:len(TokenList)] = TokenList\r
-                \r
+\r
                 #\r
                 # Replace with [Defines] section Macro\r
                 #\r
-                ValueList[0] = InfExpandMacro(ValueList[0], (FileName, LineContent, LineNo), \r
+                ValueList[0] = InfExpandMacro(ValueList[0], (FileName, LineContent, LineNo),\r
                                               self.FileLocalMacros, None)\r
-                ValueList[1] = InfExpandMacro(ValueList[1], (FileName, LineContent, LineNo), \r
+                ValueList[1] = InfExpandMacro(ValueList[1], (FileName, LineContent, LineNo),\r
                                               self.FileLocalMacros, None, True)\r
                 EqualString = ''\r
                 if not ReplaceFlag:\r
@@ -108,30 +108,30 @@ class InfBuildOptionSectionParser(InfParserSectionRoot):
 \r
                 Family = GetSplitValueList(ValueList[0], DT.TAB_COLON_SPLIT, 1)\r
                 if len(Family) == 2:\r
-                    if not IsValidFamily(Family[0]):            \r
-                        Logger.Error('InfParser', \r
+                    if not IsValidFamily(Family[0]):\r
+                        Logger.Error('InfParser',\r
                                      FORMAT_INVALID,\r
                                      ST.ERR_INF_PARSER_BUILD_OPTION_FORMAT_INVALID,\r
-                                     ExtraData=LineContent, \r
+                                     ExtraData=LineContent,\r
                                      File=FileName,\r
                                      Line=LineNo)\r
                     if not IsValidBuildOptionName(Family[1]):\r
-                        Logger.Error('InfParser', \r
+                        Logger.Error('InfParser',\r
                                      FORMAT_INVALID,\r
                                      ST.ERR_INF_PARSER_BUILD_OPTION_FORMAT_INVALID,\r
-                                     ExtraData=LineContent, \r
+                                     ExtraData=LineContent,\r
                                      File=FileName,\r
                                      Line=LineNo)\r
                 if len(Family) == 1:\r
                     if not IsValidBuildOptionName(Family[0]):\r
-                        Logger.Error('InfParser', \r
+                        Logger.Error('InfParser',\r
                                      FORMAT_INVALID,\r
                                      ST.ERR_INF_PARSER_BUILD_OPTION_FORMAT_INVALID,\r
-                                     ExtraData=LineContent, \r
+                                     ExtraData=LineContent,\r
                                      File=FileName,\r
                                      Line=LineNo)\r
-                                                \r
-                BuildOptionList.append(ValueList)                  \r
+\r
+                BuildOptionList.append(ValueList)\r
                 ValueList = []\r
                 continue\r
         else:\r
@@ -147,20 +147,20 @@ class InfBuildOptionSectionParser(InfParserSectionRoot):
             if not (Item[1] == '' or Item[1] == '') and Item[1] not in ArchList:\r
                 ArchList.append(Item[1])\r
                 InfSectionObject.SetSupArchList(Item[1])\r
-      \r
+\r
         InfSectionObject.SetAllContent(SectionContent)\r
         if not InfSectionObject.SetBuildOptions(BuildOptionList, ArchList, SectionContent):\r
-            Logger.Error('InfParser', \r
+            Logger.Error('InfParser',\r
                          FORMAT_INVALID,\r
                          ST.ERR_INF_PARSER_MODULE_SECTION_TYPE_ERROR%("[BuilOptions]"),\r
                          File=FileName,\r
-                         Line=LastItem[3]) \r
+                         Line=LastItem[3])\r
 \r
 ## InfBuildOptionParser\r
 #\r
 #\r
 def InfAsBuiltBuildOptionParser(SectionString, FileName):\r
-    BuildOptionList = []       \r
+    BuildOptionList = []\r
     #\r
     # AsBuild Binary INF file.\r
     #\r
@@ -171,7 +171,7 @@ def InfAsBuiltBuildOptionParser(SectionString, FileName):
         Count += 1\r
         LineContent = Line[0]\r
         LineNo      = Line[1]\r
-        \r
+\r
         #\r
         # The last line\r
         #\r
@@ -186,33 +186,33 @@ def InfAsBuiltBuildOptionParser(SectionString, FileName):
             else:\r
                 if len(BuildOptionItem) > 0:\r
                     BuildOptionList.append(BuildOptionItem)\r
-            \r
-            break                    \r
-        \r
+\r
+            break\r
+\r
         if LineContent.strip() == '':\r
             AsBuildOptionFlag = False\r
             continue\r
-        \r
+\r
         if LineContent.strip().startswith("##") and AsBuildOptionFlag:\r
             if len(BuildOptionItem) > 0:\r
-                BuildOptionList.append(BuildOptionItem) \r
-                \r
+                BuildOptionList.append(BuildOptionItem)\r
+\r
             BuildOptionItem = []\r
-        \r
+\r
         if not LineContent.strip().startswith("#"):\r
-            Logger.Error('InfParser', \r
+            Logger.Error('InfParser',\r
                         FORMAT_INVALID,\r
-                        ST.ERR_BO_CONTATIN_ASBUILD_AND_COMMON, \r
-                        File=FileName, \r
-                        Line=LineNo, \r
+                        ST.ERR_BO_CONTATIN_ASBUILD_AND_COMMON,\r
+                        File=FileName,\r
+                        Line=LineNo,\r
                         ExtraData=LineContent)\r
-        \r
+\r
         if IsAsBuildOptionInfo(LineContent):\r
             AsBuildOptionFlag = True\r
             continue\r
-        \r
+\r
         if AsBuildOptionFlag:\r
             BuildOptionInfo = GetHelpStringByRemoveHashKey(LineContent)\r
             BuildOptionItem.append(BuildOptionInfo)\r
-        \r
-    return BuildOptionList
\ No newline at end of file
+\r
+    return BuildOptionList\r