BaseTools: Clean up source files

[mirror_edk2.git] / BaseTools / Source / Python / UPT / Core / DistributionPackageClass.py

diff --git a/BaseTools/Source/Python/UPT/Core/DistributionPackageClass.py b/BaseTools/Source/Python/UPT/Core/DistributionPackageClass.py
index 81c67fb510a28014981c2647020262f9f4b17247..873e2b4de441fa9ffbc2ebfcc3a7c6e80e76df39 100644 (file)
--- a/BaseTools/Source/Python/UPT/Core/DistributionPackageClass.py
+++ b/BaseTools/Source/Python/UPT/Core/DistributionPackageClass.py
@@ -1,11 +1,11 @@
 ## @file\r
 # This file is used to define a class object to describe a distribution package\r
 #\r
-# Copyright (c) 2011 - 2014, 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
@@ -50,62 +50,62 @@ class DistributionPackageHeaderObject(IdentificationObject, \
         self.Date = ''\r
         self.Signature = 'Md5Sum'\r
         self.XmlSpecification = ''\r
-    \r
+\r
     def GetReadOnly(self):\r
         return self.ReadOnly\r
-    \r
+\r
     def SetReadOnly(self, ReadOnly):\r
         self.ReadOnly = ReadOnly\r
-    \r
+\r
     def GetRePackage(self):\r
         return self.RePackage\r
-    \r
+\r
     def SetRePackage(self, RePackage):\r
         self.RePackage = RePackage\r
-        \r
+\r
     def GetVendor(self):\r
         return self.Vendor\r
-    \r
+\r
     def SetDate(self, Date):\r
         self.Date = Date\r
-        \r
+\r
     def GetDate(self):\r
         return self.Date\r
-    \r
+\r
     def SetSignature(self, Signature):\r
         self.Signature = Signature\r
-        \r
+\r
     def GetSignature(self):\r
         return self.Signature\r
-    \r
+\r
     def SetXmlSpecification(self, XmlSpecification):\r
         self.XmlSpecification = XmlSpecification\r
-        \r
+\r
     def GetXmlSpecification(self):\r
         return self.XmlSpecification\r
-    \r
+\r
 ## DistributionPackageClass\r
 #\r
 # @param object: DistributionPackageClass\r
-# \r
+#\r
 class DistributionPackageClass(object):\r
     def __init__(self):\r
         self.Header = DistributionPackageHeaderObject()\r
         #\r
         # {(Guid, Version, Path) : PackageObj}\r
         #\r
-        self.PackageSurfaceArea = Sdict() \r
+        self.PackageSurfaceArea = Sdict()\r
         #\r
         # {(Guid, Version, Name, Path) : ModuleObj}\r
         #\r
-        self.ModuleSurfaceArea = Sdict()  \r
+        self.ModuleSurfaceArea = Sdict()\r
         self.Tools = MiscFileObject()\r
         self.MiscellaneousFiles = MiscFileObject()\r
         self.UserExtensions = []\r
         self.FileList = []\r
-    \r
+\r
     ## Get all included packages and modules for a distribution package\r
-    # \r
+    #\r
     # @param WorkspaceDir:  WorkspaceDir\r
     # @param PackageList:   A list of all packages\r
     # @param ModuleList:    A list of all modules\r
@@ -132,7 +132,7 @@ class DistributionPackageClass(object):
                     WsRelPath = os.path.normpath(WsRelPath)\r
                     if ModuleList and WsRelPath in ModuleList:\r
                         Logger.Error("UPT",\r
-                                     OPTION_VALUE_INVALID, \r
+                                     OPTION_VALUE_INVALID,\r
                                      ST.ERR_NOT_STANDALONE_MODULE_ERROR%\\r
                                      (WsRelPath, PackageFile))\r
                     Filename = os.path.normpath\\r
@@ -140,12 +140,12 @@ class DistributionPackageClass(object):
                     os.path.splitext(Filename)\r
                     #\r
                     # Call INF parser to generate Inf Object.\r
-                    # Actually, this call is not directly call, but wrapped by \r
+                    # Actually, this call is not directly call, but wrapped by\r
                     # Inf class in InfPomAlignment.\r
                     #\r
                     try:\r
                         ModuleObj = InfPomAlignment(Filename, WorkspaceDir, PackageObj.GetPackagePath())\r
-     \r
+\r
                         #\r
                         # Add module to package\r
                         #\r
@@ -161,7 +161,7 @@ class DistributionPackageClass(object):
                                         ST.WRN_EDK1_INF_FOUND%Filename)\r
                         else:\r
                             raise\r
-                \r
+\r
                 self.PackageSurfaceArea\\r
                 [(PackageObj.GetGuid(), PackageObj.GetVersion(), \\r
                   PackageObj.GetCombinePath())] = PackageObj\r
@@ -176,16 +176,16 @@ class DistributionPackageClass(object):
 \r
                 try:\r
                     ModuleObj = InfPomAlignment(ModuleFileFullPath, WorkspaceDir)\r
-                    ModuleKey = (ModuleObj.GetGuid(), \r
-                                 ModuleObj.GetVersion(), \r
-                                 ModuleObj.GetName(), \r
+                    ModuleKey = (ModuleObj.GetGuid(),\r
+                                 ModuleObj.GetVersion(),\r
+                                 ModuleObj.GetName(),\r
                                  ModuleObj.GetCombinePath())\r
                     self.ModuleSurfaceArea[ModuleKey] = ModuleObj\r
                 except FatalError as ErrCode:\r
                     if ErrCode.message == EDK1_INF_ERROR:\r
                         Logger.Error("UPT",\r
                                      EDK1_INF_ERROR,\r
-                                     ST.WRN_EDK1_INF_FOUND%ModuleFileFullPath, \r
+                                     ST.WRN_EDK1_INF_FOUND%ModuleFileFullPath,\r
                                      ExtraData=ST.ERR_NOT_SUPPORTED_SA_MODULE)\r
                     else:\r
                         raise\r
@@ -193,16 +193,16 @@ class DistributionPackageClass(object):
         # Recover WorkspaceDir\r
         WorkspaceDir = Root\r
 \r
-    ## Get all files included for a distribution package, except tool/misc of \r
+    ## Get all files included for a distribution package, except tool/misc of\r
     # distribution level\r
-    # \r
+    #\r
     # @retval DistFileList  A list of filepath for NonMetaDataFile, relative to workspace\r
     # @retval MetaDataFileList  A list of filepath for MetaDataFile, relative to workspace\r
     #\r
     def GetDistributionFileList(self):\r
         MetaDataFileList = []\r
         SkipModulesUniList = []\r
-        \r
+\r
         for Guid, Version, Path in self.PackageSurfaceArea:\r
             Package = self.PackageSurfaceArea[Guid, Version, Path]\r
             PackagePath = Package.GetPackagePath()\r
@@ -221,7 +221,7 @@ class DistributionPackageClass(object):
                     MiscFileFullPath = os.path.normpath(os.path.join(PackagePath, FileObj.GetURI()))\r
                     if MiscFileFullPath not in self.FileList:\r
                         self.FileList.append(MiscFileFullPath)\r
-            \r
+\r
             Module = None\r
             ModuleDict = Package.GetModuleDict()\r
             for Guid, Version, Name, Path in ModuleDict:\r
@@ -262,12 +262,12 @@ class DistributionPackageClass(object):
             for NonMetaDataFile in NonMetaDataFileList:\r
                 if NonMetaDataFile not in self.FileList:\r
                     self.FileList.append(NonMetaDataFile)\r
-            \r
+\r
         for SkipModuleUni in SkipModulesUniList:\r
             if SkipModuleUni in self.FileList:\r
                 self.FileList.remove(SkipModuleUni)\r
 \r
         return  self.FileList, MetaDataFileList\r
 \r
-        \r
+\r
 \r