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

This patch is going to: 

1. Fix a bug in GenFds for wrongly handling '"' of command line parameter.
2. Provide different input parameter mode for different OS. For Linux, using a list. For Windows, using a string.
3. Remove 3 un-existing function calling.

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@15847 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
Hess Chen 2014-08-20 07:41:38 +00:00 committed by hchen30
parent 0a13a62413
commit df0cee8d8c
2 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
BaseTools/Source/Python/GenFds/GenFds.py
View File

@ -157,7 +157,7 @@ def main():
if Options.Macros: if Options.Macros:
for Pair in Options.Macros: for Pair in Options.Macros:
Pair.strip('"') Pair = Pair.strip('"')
List = Pair.split('=') List = Pair.split('=')
if len(List) == 2: if len(List) == 2:
if List[0].strip() == "EFI_SOURCE": if List[0].strip() == "EFI_SOURCE":

6
BaseTools/Source/Python/build/build.py
View File

@ -251,7 +251,8 @@ def LaunchCommand(Command, WorkingDir):
# ubuntu may fail with an error message that the command is not found. # ubuntu may fail with an error message that the command is not found.
# So here we may need convert command from string to list instance. # So here we may need convert command from string to list instance.
if not isinstance(Command, list): if not isinstance(Command, list):
Command = Command.split() if platform.system() != 'Windows':
Command = Command.split()
Proc = None Proc = None
EndOfProcedure = None EndOfProcedure = None
@ -928,7 +929,6 @@ class Build():
if BuildModule: if BuildModule:
BuildCommand = BuildCommand + [Target] BuildCommand = BuildCommand + [Target]
LaunchCommand(BuildCommand, AutoGenObject.MakeFileDir) LaunchCommand(BuildCommand, AutoGenObject.MakeFileDir)
self.CreateAsBuiltInf()
return True return True
# build library # build library
@ -946,7 +946,6 @@ class Build():
for Mod in AutoGenObject.ModuleBuildDirectoryList: for Mod in AutoGenObject.ModuleBuildDirectoryList:
NewBuildCommand = BuildCommand + ['-f', os.path.normpath(os.path.join(Mod, makefile)), 'pbuild'] NewBuildCommand = BuildCommand + ['-f', os.path.normpath(os.path.join(Mod, makefile)), 'pbuild']
LaunchCommand(NewBuildCommand, AutoGenObject.MakeFileDir) LaunchCommand(NewBuildCommand, AutoGenObject.MakeFileDir)
self.CreateAsBuiltInf()
return True return True
# cleanlib # cleanlib
@ -1056,7 +1055,6 @@ class Build():
BuildCommand = BuildCommand + [Target] BuildCommand = BuildCommand + [Target]
if BuildModule: if BuildModule:
LaunchCommand(BuildCommand, AutoGenObject.MakeFileDir) LaunchCommand(BuildCommand, AutoGenObject.MakeFileDir)
self.CreateAsBuiltInf()
return True return True
# build library # build library