BaseTools/UPT: Replace os.linesep with '\r\n' when generating UNI files.

[mirror_edk2.git] / BaseTools / Source / Python / UPT / GenMetaFile / GenDecFile.py

diff --git a/BaseTools/Source/Python/UPT/GenMetaFile/GenDecFile.py b/BaseTools/Source/Python/UPT/GenMetaFile/GenDecFile.py
index d886958f97f1cd2d850380e3c9cf3c79cc76e4f0..80b32ae5e70341f66661694d6a0ea26ef7cdc481 100644 (file)
--- a/BaseTools/Source/Python/UPT/GenMetaFile/GenDecFile.py
+++ b/BaseTools/Source/Python/UPT/GenMetaFile/GenDecFile.py
@@ -582,20 +582,17 @@ def GenPackageUNIEncodeFile(PackageObject, UniFileHeader = '', Encoding=TAB_ENCO
     ContainerFile = os.path.normpath(os.path.join(os.path.dirname(PackageObject.GetFullPath()), \r
                                                   (PackageObject.GetBaseName() + '.uni')))\r
     \r
-    Content = UniFileHeader + os.linesep\r
-    Content += os.linesep\r
+    Content = UniFileHeader + '\r\n'\r
+    Content += '\r\n'\r
     \r
-    Content += FormatUniEntry('#string ' + TAB_DEC_PACKAGE_ABSTRACT, PackageObject.GetAbstract(), ContainerFile) \\r
-    + os.linesep\r
+    Content += FormatUniEntry('#string ' + TAB_DEC_PACKAGE_ABSTRACT, PackageObject.GetAbstract(), ContainerFile) + '\r\n'\r
         \r
     Content += FormatUniEntry('#string ' + TAB_DEC_PACKAGE_DESCRIPTION, PackageObject.GetDescription(), ContainerFile) \\r
-    + os.linesep\r
+    + '\r\n'\r
     \r
-    Content += FormatUniEntry('#string ' + TAB_DEC_BINARY_ABSTRACT, BinaryAbstract, ContainerFile) \\r
-    + os.linesep\r
+    Content += FormatUniEntry('#string ' + TAB_DEC_BINARY_ABSTRACT, BinaryAbstract, ContainerFile) + '\r\n'\r
     \r
-    Content += FormatUniEntry('#string ' + TAB_DEC_BINARY_DESCRIPTION, BinaryDescription, ContainerFile) \\r
-    + os.linesep\r
+    Content += FormatUniEntry('#string ' + TAB_DEC_BINARY_DESCRIPTION, BinaryDescription, ContainerFile) + '\r\n'\r
     \r
     PromptGenList = []\r
     HelpTextGenList = []    \r
@@ -612,7 +609,7 @@ def GenPackageUNIEncodeFile(PackageObject, UniFileHeader = '', Encoding=TAB_ENCO
             if (PcdPromptStrName, Lang) not in PromptGenList:\r
                 TokenValueList.append((Lang, PromptStr))\r
                 PromptGenList.append((PcdPromptStrName, Lang))\r
-        PromptString = FormatUniEntry(PcdPromptStrName, TokenValueList, ContainerFile) + os.linesep\r
+        PromptString = FormatUniEntry(PcdPromptStrName, TokenValueList, ContainerFile) + '\r\n'\r
         if PromptString not in Content:\r
             Content += PromptString\r
             \r
@@ -628,7 +625,7 @@ def GenPackageUNIEncodeFile(PackageObject, UniFileHeader = '', Encoding=TAB_ENCO
             if (PcdHelpStrName, Lang) not in HelpTextGenList:\r
                 TokenValueList.append((Lang, HelpStr))\r
                 HelpTextGenList.append((PcdHelpStrName, Lang))\r
-        HelpTextString = FormatUniEntry(PcdHelpStrName, TokenValueList, ContainerFile) + os.linesep\r
+        HelpTextString = FormatUniEntry(PcdHelpStrName, TokenValueList, ContainerFile) + '\r\n'\r
         if HelpTextString not in Content:\r
             Content += HelpTextString\r
             \r
@@ -639,7 +636,7 @@ def GenPackageUNIEncodeFile(PackageObject, UniFileHeader = '', Encoding=TAB_ENCO
                 PcdErrStrName = '#string ' + TAB_STR_TOKENCNAME + TAB_UNDERLINE_SPLIT + Pcd.GetTokenSpaceGuidCName() \\r
                     + TAB_UNDERLINE_SPLIT + TAB_STR_TOKENERR \\r
                     + TAB_UNDERLINE_SPLIT + ErrorNo[2:]\r
-                PcdErrString = FormatUniEntry(PcdErrStrName, PcdError.GetErrorMessageList(), ContainerFile) + os.linesep\r
+                PcdErrString = FormatUniEntry(PcdErrStrName, PcdError.GetErrorMessageList(), ContainerFile) + '\r\n'\r
                 if PcdErrString not in Content:\r
                     Content += PcdErrString\r
                     \r