From: Laszlo Ersek <lersek@redhat.com>
To: Ard Biesheuvel <ard.biesheuvel@linaro.org>,
"Gao, Liming" <liming.gao@intel.com>,
Marcin Wojtas <mw@semihalf.com>,
Leif Lindholm <leif.lindholm@linaro.org>
Cc: "Feng, Bob C" <bob.c.feng@intel.com>,
"edk2-devel@lists.01.org" <edk2-devel@lists.01.org>
Subject: Re: [Patch V2] BaseTool: Fixed incremental rebuild issue.
Date: Fri, 22 Feb 2019 21:08:18 +0100 [thread overview]
Message-ID: <a83eee10-60bd-27f6-c970-48b9e9874d99@redhat.com> (raw)
In-Reply-To: <CAKv+Gu_J7bfDCCFAG_o82cFMeM26TNE_U8iP2WWLdaTTqkPCkw@mail.gmail.com>
On 02/22/19 20:21, Ard Biesheuvel wrote:
> On Fri, 22 Feb 2019 at 08:26, Gao, Liming <liming.gao@intel.com> wrote:
>>
>> Reviewed-by: Liming Gao <liming.gao@intel.com>
>>
>
> Incremental builds are still broken for me, even with this patch. Is
> anyone else seeing the same?
I am not; but I've been using Python3.4 for a while now (it is needed by
another package on my system, and then the build tools find it too).
The regression is attributed to commit d943b0c339fe ("BaseTools: Handle
the bytes and str difference", 2019-02-01), which I believe is related
to the python2/3 conversion. So I assume python3.4 masks the problem.
Thanks
Laszlo
>>> -----Original Message-----
>>> From: Feng, Bob C
>>> Sent: Wednesday, February 20, 2019 11:22 PM
>>> To: edk2-devel@lists.01.org
>>> Cc: Feng, Bob C <bob.c.feng@intel.com>; Gao, Liming <liming.gao@intel.com>
>>> Subject: [Patch V2] BaseTool: Fixed incremental rebuild issue.
>>>
>>> BZ: https://bugzilla.tianocore.org/show_bug.cgi?id=1540
>>>
>>> This issue in introduced by commit
>>> d943b0c339fe3d35ffdf9f580ccb7a55915c6854
>>>
>>> To convert bytes to string, we need to use bytes.decode()
>>> instead of using str(bytes).
>>>
>>> If the source file is not a txt file, ignore that file.
>>>
>>> Contributed-under: TianoCore Contribution Agreement 1.1
>>> Signed-off-by: Bob Feng <bob.c.feng@intel.com>
>>> Cc: Liming Gao <liming.gao@intel.com>
>>> ---
>>> BaseTools/Source/Python/AutoGen/GenMake.py | 16 ++++++++--------
>>> .../Source/Python/Workspace/DscBuildData.py | 17 ++++++++---------
>>> 2 files changed, 16 insertions(+), 17 deletions(-)
>>>
>>> diff --git a/BaseTools/Source/Python/AutoGen/GenMake.py
>>> b/BaseTools/Source/Python/AutoGen/GenMake.py
>>> index 53c5b8577d..b441817b52 100644
>>> --- a/BaseTools/Source/Python/AutoGen/GenMake.py
>>> +++ b/BaseTools/Source/Python/AutoGen/GenMake.py
>>> @@ -1043,18 +1043,18 @@ cleanlib:
>>> Fd.close()
>>> except BaseException as X:
>>> EdkLogger.error("build", FILE_OPEN_FAILURE, ExtraData=F.Path +
>>> "\n\t" + str(X))
>>> if len(FileContent) == 0:
>>> continue
>>> -
>>> - if FileContent[0] == 0xff or FileContent[0] == 0xfe:
>>> - FileContent = FileContent.decode('utf-16')
>>> - else:
>>> - try:
>>> - FileContent = str(FileContent)
>>> - except:
>>> - pass
>>> + try:
>>> + if FileContent[0] == 0xff or FileContent[0] == 0xfe:
>>> + FileContent = FileContent.decode('utf-16')
>>> + else:
>>> + FileContent = FileContent.decode()
>>> + except:
>>> + # The file is not txt file. for example .mcb file
>>> + continue
>>> IncludedFileList = gIncludePattern.findall(FileContent)
>>>
>>> for Inc in IncludedFileList:
>>> Inc = Inc.strip()
>>> # if there's macro used to reference header file, expand it
>>> diff --git a/BaseTools/Source/Python/Workspace/DscBuildData.py
>>> b/BaseTools/Source/Python/Workspace/DscBuildData.py
>>> index 1ffefe6e7e..7221946062 100644
>>> --- a/BaseTools/Source/Python/Workspace/DscBuildData.py
>>> +++ b/BaseTools/Source/Python/Workspace/DscBuildData.py
>>> @@ -153,19 +153,18 @@ def GetDependencyList(FileStack, SearchPathList):
>>> Fd.close()
>>>
>>> if len(FileContent) == 0:
>>> continue
>>>
>>> - if FileContent[0] == 0xff or FileContent[0] == 0xfe:
>>> - FileContent = FileContent.decode('utf-16')
>>> - IncludedFileList = gIncludePattern.findall(FileContent)
>>> - else:
>>> - try:
>>> - FileContent = str(FileContent)
>>> - IncludedFileList = gIncludePattern.findall(FileContent)
>>> - except:
>>> - pass
>>> + try:
>>> + if FileContent[0] == 0xff or FileContent[0] == 0xfe:
>>> + FileContent = FileContent.decode('utf-16')
>>> + else:
>>> + FileContent = FileContent.decode()
>>> + except:
>>> + # The file is not txt file. for example .mcb file
>>> + continue
>>> IncludedFileList = gIncludePattern.findall(FileContent)
>>>
>>> for Inc in IncludedFileList:
>>> Inc = Inc.strip()
>>> Inc = os.path.normpath(Inc)
>>> --
>>> 2.18.0.windows.1
>>
>> _______________________________________________
>> edk2-devel mailing list
>> edk2-devel@lists.01.org
>> https://lists.01.org/mailman/listinfo/edk2-devel
next prev parent reply other threads:[~2019-02-22 20:08 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-02-20 15:21 [Patch V2] BaseTool: Fixed incremental rebuild issue Feng, Bob C
2019-02-22 7:26 ` Gao, Liming
2019-02-22 19:21 ` Ard Biesheuvel
2019-02-22 20:08 ` Laszlo Ersek [this message]
2019-02-23 10:14 ` Marcin Wojtas
2019-02-23 10:48 ` Ard Biesheuvel
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-list from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=a83eee10-60bd-27f6-c970-48b9e9874d99@redhat.com \
--to=devel@edk2.groups.io \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox