tyler.durden
/
audk
mirror of https://github.com/acidanthera/audk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Basetools: It went wrong when use os.linesep 

in python2 and python3,use of line breaks

Cc: Bob Feng <bob.c.feng@intel.com>
Cc: Liming Gao <liming.gao@intel.com>
Cc: Yonghong Zhu <yonghong.zhu@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Zhiju.Fan <zhijux.fan@intel.com>
Tested-by: Laszlo Ersek <lersek@redhat.com>
Tested-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Reviewed-by: Liming Gao <liming.gao@intel.com>
Reviewed-by: Bob Feng <bob.c.feng@intel.com>
This commit is contained in:
Zhijux Fan 2018-12-18 10:45:04 +08:00 committed by Feng, Bob C
parent 7cc7e054f8
commit 2c2bb053a3
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
BaseTools/Source/Python/AutoGen/AutoGen.py
View File

@ -681,17 +681,17 @@ class WorkspaceAutoGen(AutoGen):
# #
content = 'gCommandLineDefines: ' content = 'gCommandLineDefines: '
content += str(GlobalData.gCommandLineDefines) content += str(GlobalData.gCommandLineDefines)
content += os.linesep content += TAB_LINE_BREAK
content += 'BuildOptionPcd: ' content += 'BuildOptionPcd: '
content += str(GlobalData.BuildOptionPcd) content += str(GlobalData.BuildOptionPcd)
content += os.linesep content += TAB_LINE_BREAK
content += 'Active Platform: ' content += 'Active Platform: '
content += str(self.Platform) content += str(self.Platform)
content += os.linesep content += TAB_LINE_BREAK
if self.FdfFile: if self.FdfFile:
content += 'Flash Image Definition: ' content += 'Flash Image Definition: '
content += str(self.FdfFile) content += str(self.FdfFile)
content += os.linesep content += TAB_LINE_BREAK
SaveFileOnChange(os.path.join(self.BuildDir, 'BuildOptions'), content, False) SaveFileOnChange(os.path.join(self.BuildDir, 'BuildOptions'), content, False)
# #
@ -701,7 +701,7 @@ class WorkspaceAutoGen(AutoGen):
if Pa.PcdTokenNumber: if Pa.PcdTokenNumber:
if Pa.DynamicPcdList: if Pa.DynamicPcdList:
for Pcd in Pa.DynamicPcdList: for Pcd in Pa.DynamicPcdList:
PcdTokenNumber += os.linesep PcdTokenNumber += TAB_LINE_BREAK
PcdTokenNumber += str((Pcd.TokenCName, Pcd.TokenSpaceGuidCName)) PcdTokenNumber += str((Pcd.TokenCName, Pcd.TokenSpaceGuidCName))
PcdTokenNumber += ' : ' PcdTokenNumber += ' : '
PcdTokenNumber += str(Pa.PcdTokenNumber[Pcd.TokenCName, Pcd.TokenSpaceGuidCName]) PcdTokenNumber += str(Pa.PcdTokenNumber[Pcd.TokenCName, Pcd.TokenSpaceGuidCName])

4
BaseTools/Source/Python/AutoGen/GenMake.py
View File

@ -548,8 +548,8 @@ cleanlib:
NewRespStr = ' '.join(NewStr) NewRespStr = ' '.join(NewStr)
SaveFileOnChange(RespFile, NewRespStr, False) SaveFileOnChange(RespFile, NewRespStr, False)
ToolsDef.append("%s = %s" % (Resp, UnexpandMacroStr + ' @' + RespFile)) ToolsDef.append("%s = %s" % (Resp, UnexpandMacroStr + ' @' + RespFile))
RespFileListContent += '@' + RespFile + os.linesep RespFileListContent += '@' + RespFile + TAB_LINE_BREAK
RespFileListContent += NewRespStr + os.linesep RespFileListContent += NewRespStr + TAB_LINE_BREAK
SaveFileOnChange(RespFileList, RespFileListContent, False) SaveFileOnChange(RespFileList, RespFileListContent, False)
else: else:
if os.path.exists(RespFileList): if os.path.exists(RespFileList):