BaseTools: Replace StandardError with Expression

[mirror_edk2.git] / BaseTools / Source / Python / UPT / PomAdapter / DecPomAlignment.py

diff --git a/BaseTools/Source/Python/UPT/PomAdapter/DecPomAlignment.py b/BaseTools/Source/Python/UPT/PomAdapter/DecPomAlignment.py
index 11b0359176c60bc284d6f37b1efa15f60a4da973..074aa311f31da7e9574a8a7245c450d5e27d6353 100644 (file)
--- a/BaseTools/Source/Python/UPT/PomAdapter/DecPomAlignment.py
+++ b/BaseTools/Source/Python/UPT/PomAdapter/DecPomAlignment.py
@@ -1,7 +1,7 @@
 ## @file DecPomAlignment.py\r
 # This file contained the adapter for convert INF parser object to POM Object\r
 #\r
-# Copyright (c) 2011 - 2014, Intel Corporation. All rights reserved.<BR>\r
+# Copyright (c) 2011 - 2016, 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
@@ -15,6 +15,7 @@
 '''\r
 DecPomAlignment\r
 '''\r
+from __future__ import print_function\r
 \r
 ##\r
 # Import Modules\r
@@ -63,6 +64,7 @@ from Library.DataType import TAB_STR_TOKENHELP
 from Library.DataType import TAB_STR_TOKENERR\r
 from Library.DataType import TAB_HEX_START\r
 from Library.DataType import TAB_SPLIT\r
+import Library.DataType as DT\r
 from Library.CommentParsing import ParseHeaderCommentSection\r
 from Library.CommentParsing import ParseGenericComment\r
 from Library.CommentParsing import ParseDecPcdGenericComment\r
@@ -221,6 +223,14 @@ class DecPomAlignment(PackageObject):
             self.SetUserExtensionList(\r
                 self.GetUserExtensionList() + [UserExtension]\r
             )\r
+\r
+        # Add Private sections to UserExtension\r
+        if self.DecParser.GetPrivateSections():\r
+            PrivateUserExtension = UserExtensionObject()\r
+            PrivateUserExtension.SetStatement(self.DecParser.GetPrivateSections())\r
+            PrivateUserExtension.SetIdentifier(DT.TAB_PRIVATE)\r
+            PrivateUserExtension.SetUserID(DT.TAB_INTEL)\r
+            self.SetUserExtensionList(self.GetUserExtensionList() + [PrivateUserExtension])\r
             \r
     ## Generate miscellaneous files on DEC file\r
     #\r
@@ -893,47 +903,47 @@ class DecPomAlignment(PackageObject):
     # Print all members and their values of Package class\r
     #\r
     def ShowPackage(self):\r
-        print '\nName =', self.GetName()\r
-        print '\nBaseName =', self.GetBaseName()\r
-        print '\nVersion =', self.GetVersion() \r
-        print '\nGuid =', self.GetGuid()\r
+        print('\nName =', self.GetName())\r
+        print('\nBaseName =', self.GetBaseName())\r
+        print('\nVersion =', self.GetVersion())\r
+        print('\nGuid =', self.GetGuid())\r
         \r
-        print '\nStandardIncludes = %d ' \\r
-            % len(self.GetStandardIncludeFileList()),\r
+        print('\nStandardIncludes = %d ' \\r
+            % len(self.GetStandardIncludeFileList()), end=' ')\r
         for Item in self.GetStandardIncludeFileList():\r
-            print Item.GetFilePath(), '  ', Item.GetSupArchList()\r
-        print '\nPackageIncludes = %d \n' \\r
-            % len(self.GetPackageIncludeFileList()),\r
+            print(Item.GetFilePath(), '  ', Item.GetSupArchList())\r
+        print('\nPackageIncludes = %d \n' \\r
+            % len(self.GetPackageIncludeFileList()), end=' ')\r
         for Item in self.GetPackageIncludeFileList():\r
-            print Item.GetFilePath(), '  ', Item.GetSupArchList()\r
+            print(Item.GetFilePath(), '  ', Item.GetSupArchList())\r
              \r
-        print '\nGuids =', self.GetGuidList()\r
+        print('\nGuids =', self.GetGuidList())\r
         for Item in self.GetGuidList():\r
-            print Item.GetCName(), Item.GetGuid(), Item.GetSupArchList()\r
-        print '\nProtocols =', self.GetProtocolList()\r
+            print(Item.GetCName(), Item.GetGuid(), Item.GetSupArchList())\r
+        print('\nProtocols =', self.GetProtocolList())\r
         for Item in self.GetProtocolList():\r
-            print Item.GetCName(), Item.GetGuid(), Item.GetSupArchList()\r
-        print '\nPpis =', self.GetPpiList()\r
+            print(Item.GetCName(), Item.GetGuid(), Item.GetSupArchList())\r
+        print('\nPpis =', self.GetPpiList())\r
         for Item in self.GetPpiList():\r
-            print Item.GetCName(), Item.GetGuid(), Item.GetSupArchList()\r
-        print '\nLibraryClasses =', self.GetLibraryClassList()\r
+            print(Item.GetCName(), Item.GetGuid(), Item.GetSupArchList())\r
+        print('\nLibraryClasses =', self.GetLibraryClassList())\r
         for Item in self.GetLibraryClassList():\r
-            print Item.GetLibraryClass(), Item.GetRecommendedInstance(), \\r
-            Item.GetSupArchList()\r
-        print '\nPcds =', self.GetPcdList()\r
+            print(Item.GetLibraryClass(), Item.GetRecommendedInstance(), \\r
+            Item.GetSupArchList())\r
+        print('\nPcds =', self.GetPcdList())\r
         for Item in self.GetPcdList():\r
-            print 'CName=', Item.GetCName(), 'TokenSpaceGuidCName=', \\r
+            print('CName=', Item.GetCName(), 'TokenSpaceGuidCName=', \\r
                 Item.GetTokenSpaceGuidCName(), \\r
                 'DefaultValue=', Item.GetDefaultValue(), \\r
                 'ValidUsage=', Item.GetValidUsage(), \\r
                 'SupArchList', Item.GetSupArchList(), \\r
-                'Token=', Item.GetToken(), 'DatumType=', Item.GetDatumType()\r
+                'Token=', Item.GetToken(), 'DatumType=', Item.GetDatumType())\r
  \r
         for Item in self.GetMiscFileList():\r
-            print Item.GetName()\r
+            print(Item.GetName())\r
             for FileObjectItem in Item.GetFileList():\r
-                print FileObjectItem.GetURI()\r
-        print '****************\n'\r
+                print(FileObjectItem.GetURI())\r
+        print('****************\n')\r
 \r
 ## GenPcdDeclaration\r
 #\r