From a146c532c754106431b063fec9985a838afd82be Mon Sep 17 00:00:00 2001 From: "Feng, YunhuaX" Date: Tue, 10 Apr 2018 09:12:49 +0800 Subject: BaseTools: fix --genfds-multi-thread generate makefile issue 1. when inf file is binary module, not generate makefile, so need generate ffs with previous method. 2. generate Ui section maybe override and the string is not $(MODULE_NAME) like as: INF RuleOverride = UI MdeModulePkg/Application/UiApp/UiApp.inf 3. Trim generate incorrect Offset.raw when some vfr not generate .lst file in Debug directory, Trim get the VFR name with the .c files replacement. 4. fix some depex file not generate issue Cc: Liming Gao Cc: Yonghong Zhu Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Yunhua Feng Reviewed-by: Yonghong Zhu --- BaseTools/Source/Python/GenFds/GenFdsGlobalVariable.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'BaseTools/Source/Python/GenFds/GenFdsGlobalVariable.py') diff --git a/BaseTools/Source/Python/GenFds/GenFdsGlobalVariable.py b/BaseTools/Source/Python/GenFds/GenFdsGlobalVariable.py index fcb191981c..2f9d58f6bf 100644 --- a/BaseTools/Source/Python/GenFds/GenFdsGlobalVariable.py +++ b/BaseTools/Source/Python/GenFds/GenFdsGlobalVariable.py @@ -464,9 +464,11 @@ class GenFdsGlobalVariable: if Ui not in [None, '']: #Cmd += ["-n", '"' + Ui + '"'] if IsMakefile: - Cmd += ["-n", "$(MODULE_NAME)"] + if Ui == "$(MODULE_NAME)": + Cmd += ['-n', Ui] + else: + Cmd += ["-n", '"' + Ui + '"'] Cmd += ["-o", Output] - #SaveFileOnChange(CommandFile, ' '.join(Cmd), False) if ' '.join(Cmd).strip() not in GenFdsGlobalVariable.SecCmdList: GenFdsGlobalVariable.SecCmdList.append(' '.join(Cmd).strip()) else: -- cgit v1.2.3