BaseTools/Upt: Fix several bugs

1. Fix a bug of generating additional EOL in file header.
2. Fix a bug of format error for Defines section.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Hess Chen <hesheng.chen@intel.com>
Reviewed-by: Yingke Liu <yingke.d.liu@Intel.com>
git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@16153 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/BaseTools/Source/Python/UPT/GenMetaFile/GenDecFile.py b/BaseTools/Source/Python/UPT/GenMetaFile/GenDecFile.py
index 80b32ae5e70341f66661694d6a0ea26ef7cdc481..f22363b3b913158f702e6c832657266e861fa54d 100644 (file)
--- a/BaseTools/Source/Python/UPT/GenMetaFile/GenDecFile.py
+++ b/BaseTools/Source/Python/UPT/GenMetaFile/GenDecFile.py
@@ -344,7 +344,7 @@ def PackageToDec(Package, DistHeader = None):
     Content += GenHeaderCommentSection(PackageAbstract, \\r
                                        PackageDescription, \\r
                                        PackageCopyright, \\r
-                                       PackageLicense)\r
+                                       PackageLicense).replace('\r\n', '\n')\r
 \r
     #\r
     # Generate Binary header \r

diff --git a/BaseTools/Source/Python/UPT/GenMetaFile/GenInfFile.py b/BaseTools/Source/Python/UPT/GenMetaFile/GenInfFile.py
index 698089287498f494a0ea621940a6934a5dad22b5..a131f98ead73bf9afb5e7ab7eec9c635a0af44c5 100644 (file)
--- a/BaseTools/Source/Python/UPT/GenMetaFile/GenInfFile.py
+++ b/BaseTools/Source/Python/UPT/GenMetaFile/GenInfFile.py
@@ -110,7 +110,7 @@ def ModuleToInf(ModuleObject, PackageObject=None, DistHeader=None):
     Content += GenHeaderCommentSection(ModuleAbstract,\r
                                        ModuleDescription,\r
                                        ModuleCopyright,\r
-                                       ModuleLicense)\r
+                                       ModuleLicense).replace('\r\n', '\n')\r
 \r
     #\r
     # Generate Binary Header \r
@@ -261,13 +261,18 @@ def GenDefines(ModuleObject):
     #\r
     # generate [Defines] section\r
     #\r
+    LeftOffset = 31\r
     Content = ''\r
     NewSectionDict = {}\r
+\r
     for UserExtension in ModuleObject.GetUserExtensionList():\r
         DefinesDict = UserExtension.GetDefinesDict()\r
         if not DefinesDict:\r
             continue\r
         for Statement in DefinesDict:\r
+            if Statement.split(DT.TAB_EQUAL_SPLIT) > 1:\r
+                Statement = (u'%s ' % Statement.split(DT.TAB_EQUAL_SPLIT, 1)[0]).ljust(LeftOffset) \\r
+                             + u'= %s' % Statement.split(DT.TAB_EQUAL_SPLIT, 1)[1].lstrip()\r
             SortedArch = DT.TAB_ARCH_COMMON\r
             if Statement.strip().startswith(DT.TAB_INF_DEFINES_CUSTOM_MAKEFILE):\r
                 pos = Statement.find(DT.TAB_VALUE_SPLIT)\r
@@ -280,11 +285,7 @@ def GenDefines(ModuleObject):
             else:\r
                 NewSectionDict[SortedArch] = [Statement]\r
     SpecialStatementList = []\r
-    #\r
-    # Add INF_VERSION statement firstly\r
-    #\r
-    \r
-    LeftOffset = 31\r
+\r
     # TAB_INF_DEFINES_INF_VERSION\r
     Statement = (u'%s ' % DT.TAB_INF_DEFINES_INF_VERSION).ljust(LeftOffset) + u'= %s' % '0x00010017'\r
     SpecialStatementList.append(Statement)\r