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

[mirror_edk2.git] / BaseTools / Source / Python / UPT / Library / CommentGenerating.py

diff --git a/BaseTools/Source/Python/UPT/Library/CommentGenerating.py b/BaseTools/Source/Python/UPT/Library/CommentGenerating.py
index 1cf919a96bae46309c0040f45b4c83d32a83b973..9c6e3aad9fcdeadd9ff74dc94ac35b7501fce3b7 100644 (file)
--- a/BaseTools/Source/Python/UPT/Library/CommentGenerating.py
+++ b/BaseTools/Source/Python/UPT/Library/CommentGenerating.py
@@ -129,45 +129,45 @@ def GenHeaderCommentSection(Abstract, Description, Copyright, License, IsBinaryH
     if isinstance(Description, unicode):\r
         Description = ConvertSpecialUnicodes(Description)\r
     if IsBinaryHeader:\r
-        Content += CommChar * 2 + TAB_SPACE_SPLIT + TAB_BINARY_HEADER_COMMENT + END_OF_LINE\r
+        Content += CommChar * 2 + TAB_SPACE_SPLIT + TAB_BINARY_HEADER_COMMENT + '\r\n'\r
     elif CommChar == TAB_COMMENT_EDK1_SPLIT:\r
         Content += CommChar + TAB_SPACE_SPLIT + TAB_COMMENT_EDK1_START + TAB_STAR + TAB_SPACE_SPLIT +\\r
-         TAB_HEADER_COMMENT + END_OF_LINE\r
+         TAB_HEADER_COMMENT + '\r\n'\r
     else:\r
-        Content += CommChar * 2 + TAB_SPACE_SPLIT + TAB_HEADER_COMMENT + END_OF_LINE\r
+        Content += CommChar * 2 + TAB_SPACE_SPLIT + TAB_HEADER_COMMENT + '\r\n'\r
     if Abstract:\r
-        Abstract = Abstract.rstrip(END_OF_LINE)\r
-        Content += CommChar + TAB_SPACE_SPLIT + (END_OF_LINE + CommChar + TAB_SPACE_SPLIT).join(GetSplitValueList\\r
-                                                                                                (Abstract, END_OF_LINE))\r
-        Content += END_OF_LINE + CommChar + END_OF_LINE\r
+        Abstract = Abstract.rstrip('\r\n')\r
+        Content += CommChar + TAB_SPACE_SPLIT + ('\r\n' + CommChar + TAB_SPACE_SPLIT).join(GetSplitValueList\\r
+                                                                                                (Abstract, '\n'))\r
+        Content += '\r\n' + CommChar + '\r\n'\r
     else:\r
-        Content += CommChar + END_OF_LINE\r
+        Content += CommChar + '\r\n'\r
 \r
     if Description:\r
-        Description = Description.rstrip(END_OF_LINE)\r
-        Content += CommChar + TAB_SPACE_SPLIT + (END_OF_LINE + CommChar + TAB_SPACE_SPLIT).join(GetSplitValueList\\r
-                                                  (Description, END_OF_LINE))\r
-        Content += END_OF_LINE + CommChar + END_OF_LINE        \r
+        Description = Description.rstrip('\r\n')\r
+        Content += CommChar + TAB_SPACE_SPLIT + ('\r\n' + CommChar + TAB_SPACE_SPLIT).join(GetSplitValueList\\r
+                                                  (Description, '\n'))\r
+        Content += '\r\n' + CommChar + '\r\n'\r
   \r
     #\r
     # There is no '#\n' line to separate multiple copyright lines in code base \r
     #\r
     if Copyright:\r
-        Copyright = Copyright.rstrip(END_OF_LINE)\r
-        Content += CommChar + TAB_SPACE_SPLIT + (END_OF_LINE + CommChar + TAB_SPACE_SPLIT).join\\r
-        (GetSplitValueList(Copyright, END_OF_LINE))\r
-        Content += END_OF_LINE + CommChar + END_OF_LINE\r
+        Copyright = Copyright.rstrip('\r\n')\r
+        Content += CommChar + TAB_SPACE_SPLIT + ('\r\n' + CommChar + TAB_SPACE_SPLIT).join\\r
+        (GetSplitValueList(Copyright, '\n'))\r
+        Content += '\r\n' + CommChar + '\r\n'\r
 \r
     if License:\r
-        License = License.rstrip(END_OF_LINE)\r
-        Content += CommChar + TAB_SPACE_SPLIT + (END_OF_LINE + CommChar + TAB_SPACE_SPLIT).join(GetSplitValueList\\r
-                                                  (License, END_OF_LINE))\r
-        Content += END_OF_LINE + CommChar + END_OF_LINE\r
+        License = License.rstrip('\r\n')\r
+        Content += CommChar + TAB_SPACE_SPLIT + ('\r\n' + CommChar + TAB_SPACE_SPLIT).join(GetSplitValueList\\r
+                                                  (License, '\n'))\r
+        Content += '\r\n' + CommChar + '\r\n'\r
     \r
     if CommChar == TAB_COMMENT_EDK1_SPLIT:\r
-        Content += CommChar + TAB_SPACE_SPLIT + TAB_STAR + TAB_COMMENT_EDK1_END + END_OF_LINE\r
+        Content += CommChar + TAB_SPACE_SPLIT + TAB_STAR + TAB_COMMENT_EDK1_END + '\r\n'\r
     else:\r
-        Content += CommChar * 2 + END_OF_LINE\r
+        Content += CommChar * 2 + '\r\n'\r
     \r
     return Content\r
 \r