diff options
| author | Hess Chen <hesheng.chen@intel.com> | 2014-08-20 07:41:38 +0000 |
|---|---|---|
| committer | hchen30 <hchen30@6f19259b-4bc3-4df7-8a09-765794883524> | 2014-08-20 07:41:38 +0000 |
| commit | df0cee8d8ce6fefc7b38ac238479300bb3051298 (patch) | |
| tree | 0c7b0069f9c276f9226366f004dcf11b22c45926 | |
| parent | 0a13a624136bf2b278851316d8eae23611d93ad2 (diff) | |
| download | edk2-platforms-df0cee8d8ce6fefc7b38ac238479300bb3051298.tar.xz | |
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
| -rw-r--r-- | BaseTools/Source/Python/GenFds/GenFds.py | 2 | ||||
| -rw-r--r-- | BaseTools/Source/Python/build/build.py | 8 |
2 files changed, 4 insertions, 6 deletions
diff --git a/BaseTools/Source/Python/GenFds/GenFds.py b/BaseTools/Source/Python/GenFds/GenFds.py index 087f7ab356..c5ccda677b 100644 --- a/BaseTools/Source/Python/GenFds/GenFds.py +++ b/BaseTools/Source/Python/GenFds/GenFds.py @@ -157,7 +157,7 @@ def main(): if Options.Macros:
for Pair in Options.Macros:
- Pair.strip('"')
+ Pair = Pair.strip('"')
List = Pair.split('=')
if len(List) == 2:
if List[0].strip() == "EFI_SOURCE":
diff --git a/BaseTools/Source/Python/build/build.py b/BaseTools/Source/Python/build/build.py index 85ee9985bb..74491f6ee7 100644 --- a/BaseTools/Source/Python/build/build.py +++ b/BaseTools/Source/Python/build/build.py @@ -251,8 +251,9 @@ def LaunchCommand(Command, WorkingDir): # 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.
if not isinstance(Command, list):
- Command = Command.split()
-
+ if platform.system() != 'Windows':
+ Command = Command.split()
+
Proc = None
EndOfProcedure = None
try:
@@ -928,7 +929,6 @@ class Build(): if BuildModule:
BuildCommand = BuildCommand + [Target]
LaunchCommand(BuildCommand, AutoGenObject.MakeFileDir)
- self.CreateAsBuiltInf()
return True
# build library
@@ -946,7 +946,6 @@ class Build(): for Mod in AutoGenObject.ModuleBuildDirectoryList:
NewBuildCommand = BuildCommand + ['-f', os.path.normpath(os.path.join(Mod, makefile)), 'pbuild']
LaunchCommand(NewBuildCommand, AutoGenObject.MakeFileDir)
- self.CreateAsBuiltInf()
return True
# cleanlib
@@ -1056,7 +1055,6 @@ class Build(): BuildCommand = BuildCommand + [Target]
if BuildModule:
LaunchCommand(BuildCommand, AutoGenObject.MakeFileDir)
- self.CreateAsBuiltInf()
return True
# build library
|