* [Patch] BaseTools: Remove invalid leading space before !INCLUDE in Makefile
@ 2020-02-27 14:25 Bob Feng
2020-02-27 14:56 ` [edk2-devel] " Liming Gao
0 siblings, 1 reply; 3+ messages in thread
From: Bob Feng @ 2020-02-27 14:25 UTC (permalink / raw)
To: devel
Cc: Andrew Fish, Laszlo Ersek, Leif Lindholm, Michael D Kinney,
Pierre Gondois
REF: https://bugzilla.tianocore.org/show_bug.cgi?id=2563
This patch is to fix a incremental build regression bug
which happen when using nmake. That's introduced by 818283de3f6d.
If there is white space before !INCLUDE instruction, nmake will not
process it. Source code's dependent header files are listed in
${deps_file} file, if it's not included successfully, nmake will
not detect the change of those header file.
This patch has been verified in Windows with VS2015 and Linux with GCC5.
The header file add/modify/delete can trig the incremental build with this fix.
There is no impact on the clean build.
Cc: Andrew Fish <afish@apple.com>
Cc: Laszlo Ersek <lersek@redhat.com>
Cc: Leif Lindholm <leif@nuviainc.com>
Cc: Michael D Kinney <michael.d.kinney@intel.com>
Cc: Pierre Gondois <pierre.gondois@arm.com>
Signed-off-by: Bob Feng <bob.c.feng@intel.com>
Acked-by: Laszlo Ersek <lersek@redhat.com>
---
V2:
1. update the subject
2. remove the Reviewed-by and tested-by
.../Source/Python/AutoGen/IncludesAutoGen.py | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/BaseTools/Source/Python/AutoGen/IncludesAutoGen.py b/BaseTools/Source/Python/AutoGen/IncludesAutoGen.py
index 0a6314266f..720d93395a 100644
--- a/BaseTools/Source/Python/AutoGen/IncludesAutoGen.py
+++ b/BaseTools/Source/Python/AutoGen/IncludesAutoGen.py
@@ -50,21 +50,21 @@ class IncludesAutoGen():
MakePath = self.module_autogen.BuildOption.get('MAKE', {}).get('PATH')
if not MakePath:
EdkLogger.error("build", PARAMETER_MISSING, Message="No Make path available.")
elif "nmake" in MakePath:
_INCLUDE_DEPS_TEMPLATE = TemplateString('''
- ${BEGIN}
- !IF EXIST(${deps_file})
- !INCLUDE ${deps_file}
- !ENDIF
- ${END}
+${BEGIN}
+!IF EXIST(${deps_file})
+!INCLUDE ${deps_file}
+!ENDIF
+${END}
''')
else:
_INCLUDE_DEPS_TEMPLATE = TemplateString('''
- ${BEGIN}
- -include ${deps_file}
- ${END}
+${BEGIN}
+-include ${deps_file}
+${END}
''')
try:
deps_include_str = _INCLUDE_DEPS_TEMPLATE.Replace(deps_file)
except Exception as e:
--
2.20.1.windows.1
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [edk2-devel] [Patch] BaseTools: Remove invalid leading space before !INCLUDE in Makefile
2020-02-27 14:25 [Patch] BaseTools: Remove invalid leading space before !INCLUDE in Makefile Bob Feng
@ 2020-02-27 14:56 ` Liming Gao
2020-03-02 2:47 ` Bob Feng
0 siblings, 1 reply; 3+ messages in thread
From: Liming Gao @ 2020-02-27 14:56 UTC (permalink / raw)
To: devel@edk2.groups.io, Feng, Bob C
Cc: Andrew Fish, Laszlo Ersek, Leif Lindholm, Kinney, Michael D,
Pierre Gondois
Reviewed-by: Liming Gao <liming.gao@intel.com>
Tested-by: Liming Gao <liming.gao@intel.com
> -----Original Message-----
> From: devel@edk2.groups.io <devel@edk2.groups.io> On Behalf Of Bob Feng
> Sent: Thursday, February 27, 2020 10:25 PM
> To: devel@edk2.groups.io
> Cc: Andrew Fish <afish@apple.com>; Laszlo Ersek <lersek@redhat.com>; Leif Lindholm <leif@nuviainc.com>; Kinney, Michael D
> <michael.d.kinney@intel.com>; Pierre Gondois <pierre.gondois@arm.com>
> Subject: [edk2-devel] [Patch] BaseTools: Remove invalid leading space before !INCLUDE in Makefile
>
> REF: https://bugzilla.tianocore.org/show_bug.cgi?id=2563
>
> This patch is to fix a incremental build regression bug
> which happen when using nmake. That's introduced by 818283de3f6d.
>
> If there is white space before !INCLUDE instruction, nmake will not
> process it. Source code's dependent header files are listed in
> ${deps_file} file, if it's not included successfully, nmake will
> not detect the change of those header file.
>
> This patch has been verified in Windows with VS2015 and Linux with GCC5.
> The header file add/modify/delete can trig the incremental build with this fix.
> There is no impact on the clean build.
>
> Cc: Andrew Fish <afish@apple.com>
> Cc: Laszlo Ersek <lersek@redhat.com>
> Cc: Leif Lindholm <leif@nuviainc.com>
> Cc: Michael D Kinney <michael.d.kinney@intel.com>
> Cc: Pierre Gondois <pierre.gondois@arm.com>
> Signed-off-by: Bob Feng <bob.c.feng@intel.com>
> Acked-by: Laszlo Ersek <lersek@redhat.com>
> ---
> V2:
> 1. update the subject
> 2. remove the Reviewed-by and tested-by
> .../Source/Python/AutoGen/IncludesAutoGen.py | 16 ++++++++--------
> 1 file changed, 8 insertions(+), 8 deletions(-)
>
> diff --git a/BaseTools/Source/Python/AutoGen/IncludesAutoGen.py b/BaseTools/Source/Python/AutoGen/IncludesAutoGen.py
> index 0a6314266f..720d93395a 100644
> --- a/BaseTools/Source/Python/AutoGen/IncludesAutoGen.py
> +++ b/BaseTools/Source/Python/AutoGen/IncludesAutoGen.py
> @@ -50,21 +50,21 @@ class IncludesAutoGen():
> MakePath = self.module_autogen.BuildOption.get('MAKE', {}).get('PATH')
> if not MakePath:
> EdkLogger.error("build", PARAMETER_MISSING, Message="No Make path available.")
> elif "nmake" in MakePath:
> _INCLUDE_DEPS_TEMPLATE = TemplateString('''
> - ${BEGIN}
> - !IF EXIST(${deps_file})
> - !INCLUDE ${deps_file}
> - !ENDIF
> - ${END}
> +${BEGIN}
> +!IF EXIST(${deps_file})
> +!INCLUDE ${deps_file}
> +!ENDIF
> +${END}
> ''')
> else:
> _INCLUDE_DEPS_TEMPLATE = TemplateString('''
> - ${BEGIN}
> - -include ${deps_file}
> - ${END}
> +${BEGIN}
> +-include ${deps_file}
> +${END}
> ''')
>
> try:
> deps_include_str = _INCLUDE_DEPS_TEMPLATE.Replace(deps_file)
> except Exception as e:
> --
> 2.20.1.windows.1
>
>
>
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [edk2-devel] [Patch] BaseTools: Remove invalid leading space before !INCLUDE in Makefile
2020-02-27 14:56 ` [edk2-devel] " Liming Gao
@ 2020-03-02 2:47 ` Bob Feng
0 siblings, 0 replies; 3+ messages in thread
From: Bob Feng @ 2020-03-02 2:47 UTC (permalink / raw)
To: Gao, Liming, devel@edk2.groups.io
Cc: Andrew Fish, Laszlo Ersek, Leif Lindholm, Kinney, Michael D,
Pierre Gondois
This patch was pushed.
https://github.com/tianocore/edk2/commit/2be4828af1c92a848af90429a9a0b44544c80553
Thanks,
Bob
-----Original Message-----
From: Gao, Liming
Sent: Thursday, February 27, 2020 10:57 PM
To: devel@edk2.groups.io; Feng, Bob C <bob.c.feng@intel.com>
Cc: Andrew Fish <afish@apple.com>; Laszlo Ersek <lersek@redhat.com>; Leif Lindholm <leif@nuviainc.com>; Kinney, Michael D <michael.d.kinney@intel.com>; Pierre Gondois <pierre.gondois@arm.com>
Subject: RE: [edk2-devel] [Patch] BaseTools: Remove invalid leading space before !INCLUDE in Makefile
Reviewed-by: Liming Gao <liming.gao@intel.com>
Tested-by: Liming Gao <liming.gao@intel.com
> -----Original Message-----
> From: devel@edk2.groups.io <devel@edk2.groups.io> On Behalf Of Bob
> Feng
> Sent: Thursday, February 27, 2020 10:25 PM
> To: devel@edk2.groups.io
> Cc: Andrew Fish <afish@apple.com>; Laszlo Ersek <lersek@redhat.com>;
> Leif Lindholm <leif@nuviainc.com>; Kinney, Michael D
> <michael.d.kinney@intel.com>; Pierre Gondois <pierre.gondois@arm.com>
> Subject: [edk2-devel] [Patch] BaseTools: Remove invalid leading space
> before !INCLUDE in Makefile
>
> REF: https://bugzilla.tianocore.org/show_bug.cgi?id=2563
>
> This patch is to fix a incremental build regression bug which happen
> when using nmake. That's introduced by 818283de3f6d.
>
> If there is white space before !INCLUDE instruction, nmake will not
> process it. Source code's dependent header files are listed in
> ${deps_file} file, if it's not included successfully, nmake will not
> detect the change of those header file.
>
> This patch has been verified in Windows with VS2015 and Linux with GCC5.
> The header file add/modify/delete can trig the incremental build with this fix.
> There is no impact on the clean build.
>
> Cc: Andrew Fish <afish@apple.com>
> Cc: Laszlo Ersek <lersek@redhat.com>
> Cc: Leif Lindholm <leif@nuviainc.com>
> Cc: Michael D Kinney <michael.d.kinney@intel.com>
> Cc: Pierre Gondois <pierre.gondois@arm.com>
> Signed-off-by: Bob Feng <bob.c.feng@intel.com>
> Acked-by: Laszlo Ersek <lersek@redhat.com>
> ---
> V2:
> 1. update the subject
> 2. remove the Reviewed-by and tested-by
> .../Source/Python/AutoGen/IncludesAutoGen.py | 16 ++++++++--------
> 1 file changed, 8 insertions(+), 8 deletions(-)
>
> diff --git a/BaseTools/Source/Python/AutoGen/IncludesAutoGen.py
> b/BaseTools/Source/Python/AutoGen/IncludesAutoGen.py
> index 0a6314266f..720d93395a 100644
> --- a/BaseTools/Source/Python/AutoGen/IncludesAutoGen.py
> +++ b/BaseTools/Source/Python/AutoGen/IncludesAutoGen.py
> @@ -50,21 +50,21 @@ class IncludesAutoGen():
> MakePath = self.module_autogen.BuildOption.get('MAKE', {}).get('PATH')
> if not MakePath:
> EdkLogger.error("build", PARAMETER_MISSING, Message="No Make path available.")
> elif "nmake" in MakePath:
> _INCLUDE_DEPS_TEMPLATE = TemplateString('''
> - ${BEGIN}
> - !IF EXIST(${deps_file})
> - !INCLUDE ${deps_file}
> - !ENDIF
> - ${END}
> +${BEGIN}
> +!IF EXIST(${deps_file})
> +!INCLUDE ${deps_file}
> +!ENDIF
> +${END}
> ''')
> else:
> _INCLUDE_DEPS_TEMPLATE = TemplateString('''
> - ${BEGIN}
> - -include ${deps_file}
> - ${END}
> +${BEGIN}
> +-include ${deps_file}
> +${END}
> ''')
>
> try:
> deps_include_str = _INCLUDE_DEPS_TEMPLATE.Replace(deps_file)
> except Exception as e:
> --
> 2.20.1.windows.1
>
>
>
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2020-03-02 2:47 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-02-27 14:25 [Patch] BaseTools: Remove invalid leading space before !INCLUDE in Makefile Bob Feng
2020-02-27 14:56 ` [edk2-devel] " Liming Gao
2020-03-02 2:47 ` Bob Feng
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox