From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=2607:f8b0:4864:20::d33; helo=mail-io1-xd33.google.com; envelope-from=ard.biesheuvel@linaro.org; receiver=edk2-devel@lists.01.org Received: from mail-io1-xd33.google.com (mail-io1-xd33.google.com [IPv6:2607:f8b0:4864:20::d33]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id 782F0202E5324 for ; Fri, 22 Feb 2019 11:21:24 -0800 (PST) Received: by mail-io1-xd33.google.com with SMTP id r136so2651794iod.3 for ; Fri, 22 Feb 2019 11:21:24 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=iIWruxEWqIFQj/SlBH871KDvGP87PHKM9Z0r/kXDo68=; b=M4UeFUlsW26wCoGq4m9dFYl54/G+hXh2NzIp9TbwxiL4xy73ykaKGXmDsgkKn01yQ+ giQdNDJHQ1rlE5Ucf/MMhUVP8v1HSVZHS+9otr6Kb761gpDJIytTUoeDbATOyaTXqZX0 uiIkRWwNrrd/W3UHm9vxKCBMjBsF76Gl9UjUNcR2pKQK3IoQBHjXie37UNMpfw5I+prr ze7dtSIXHEFUvGjLenWbHS7Xgctqh6h6auG+upFBGgk8bAZYABk8ti5fNQwJtgKEqj/9 CbOfpdV4fN3knoyX3VV0+RympJQx1I67yjifsm2Ztyy+Xmj3IGEMHiApn+6tS0opcgkW UgWA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=iIWruxEWqIFQj/SlBH871KDvGP87PHKM9Z0r/kXDo68=; b=B9UTgNB4Q97HYq153RbJaHZFBgQ64bjp8vMaH0US4PRwuLFSIOEv65BA0nBEzMCh+d 7t6hNu9UW4jQR98ipHO28qpWQSp3K/ZTVMqcW+BAY1lq/1F44ujnVjvr6QjYQJGTS7on Z1uXj7k4vapYagcy2UbhDxK4QQ84vRQUoQCM0zsWm5s4iaRsuAYXmz4EZMJTo+U/W7gY RVu+ZFu7Hxg+A5xZ1Iiw8nlAd9VmphC212hh4Bf9bv5L7G4ifwh4CEB/u66yd6Dtlv7/ e6HTldpE6mtAFEYdOSGPamKFm7EFvPZGhBiECWZ+PYjObzhwZi8yb78hOxNDydZSOuUF kVQA== X-Gm-Message-State: AHQUAuaZgXlbHCktQreGCGEV3ktUlru0HiQjRSTEAXimv5rQF7ToJLkM ZqtFPFmOP3SDlvxYvoIvBhAs7lvrLv+ZMPZoVLBGAg== X-Google-Smtp-Source: AHgI3IbzR77b0Oor0ZKXqA4e0L//e79UyCe12zPkFXauz74aDBhU3oQzQWZ8PjSPKv3unpruKWzi6oiBzb545IYZ52o= X-Received: by 2002:a5e:d609:: with SMTP id w9mr3095416iom.170.1550863283165; Fri, 22 Feb 2019 11:21:23 -0800 (PST) MIME-Version: 1.0 References: <20190220152131.12008-1-bob.c.feng@intel.com> <4A89E2EF3DFEDB4C8BFDE51014F606A14E3E5E20@SHSMSX104.ccr.corp.intel.com> In-Reply-To: <4A89E2EF3DFEDB4C8BFDE51014F606A14E3E5E20@SHSMSX104.ccr.corp.intel.com> From: Ard Biesheuvel Date: Fri, 22 Feb 2019 20:21:10 +0100 Message-ID: To: "Gao, Liming" , Marcin Wojtas , Laszlo Ersek , Leif Lindholm Cc: "Feng, Bob C" , "edk2-devel@lists.01.org" Subject: Re: [Patch V2] BaseTool: Fixed incremental rebuild issue. X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 22 Feb 2019 19:21:24 -0000 Content-Type: text/plain; charset="UTF-8" On Fri, 22 Feb 2019 at 08:26, Gao, Liming wrote: > > Reviewed-by: Liming Gao > Incremental builds are still broken for me, even with this patch. Is anyone else seeing the same? > >-----Original Message----- > >From: Feng, Bob C > >Sent: Wednesday, February 20, 2019 11:22 PM > >To: edk2-devel@lists.01.org > >Cc: Feng, Bob C ; Gao, Liming > >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 > >Cc: Liming Gao > >--- > > 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