From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=134.134.136.65; helo=mga03.intel.com; envelope-from=liming.gao@intel.com; receiver=edk2-devel@lists.01.org Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id C4044211CBD0F for ; Thu, 21 Feb 2019 23:26:37 -0800 (PST) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga002.jf.intel.com ([10.7.209.21]) by orsmga103.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 21 Feb 2019 23:26:36 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.58,398,1544515200"; d="scan'208";a="136313732" Received: from fmsmsx105.amr.corp.intel.com ([10.18.124.203]) by orsmga002.jf.intel.com with ESMTP; 21 Feb 2019 23:26:35 -0800 Received: from fmsmsx116.amr.corp.intel.com (10.18.116.20) by FMSMSX105.amr.corp.intel.com (10.18.124.203) with Microsoft SMTP Server (TLS) id 14.3.408.0; Thu, 21 Feb 2019 23:26:35 -0800 Received: from shsmsx101.ccr.corp.intel.com (10.239.4.153) by fmsmsx116.amr.corp.intel.com (10.18.116.20) with Microsoft SMTP Server (TLS) id 14.3.408.0; Thu, 21 Feb 2019 23:26:34 -0800 Received: from shsmsx104.ccr.corp.intel.com ([169.254.5.102]) by SHSMSX101.ccr.corp.intel.com ([169.254.1.110]) with mapi id 14.03.0415.000; Fri, 22 Feb 2019 15:26:32 +0800 From: "Gao, Liming" To: "Feng, Bob C" , "edk2-devel@lists.01.org" Thread-Topic: [Patch V2] BaseTool: Fixed incremental rebuild issue. Thread-Index: AQHUyTA7xCmE/V9NQkiA1+3dbsB8v6XrbXMg Date: Fri, 22 Feb 2019 07:26:32 +0000 Message-ID: <4A89E2EF3DFEDB4C8BFDE51014F606A14E3E5E20@SHSMSX104.ccr.corp.intel.com> References: <20190220152131.12008-1-bob.c.feng@intel.com> In-Reply-To: <20190220152131.12008-1-bob.c.feng@intel.com> Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [10.239.127.40] MIME-Version: 1.0 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 07:26:38 -0000 Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Reviewed-by: Liming Gao >-----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=3D1540 > >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= =3DF.Path + >"\n\t" + str(X)) > if len(FileContent) =3D=3D 0: > continue >- >- if FileContent[0] =3D=3D 0xff or FileContent[0] =3D=3D 0x= fe: >- FileContent =3D FileContent.decode('utf-16') >- else: >- try: >- FileContent =3D str(FileContent) >- except: >- pass >+ try: >+ if FileContent[0] =3D=3D 0xff or FileContent[0] =3D= =3D 0xfe: >+ FileContent =3D FileContent.decode('utf-16') >+ else: >+ FileContent =3D FileContent.decode() >+ except: >+ # The file is not txt file. for example .mcb file >+ continue > IncludedFileList =3D gIncludePattern.findall(FileContent) > > for Inc in IncludedFileList: > Inc =3D Inc.strip() > # if there's macro used to reference header file, exp= and 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) =3D=3D 0: > continue > >- if FileContent[0] =3D=3D 0xff or FileContent[0] =3D=3D 0xfe: >- FileContent =3D FileContent.decode('utf-16') >- IncludedFileList =3D gIncludePattern.findall(FileContent) >- else: >- try: >- FileContent =3D str(FileContent) >- IncludedFileList =3D gIncludePattern.findall(FileCont= ent) >- except: >- pass >+ try: >+ if FileContent[0] =3D=3D 0xff or FileContent[0] =3D=3D 0x= fe: >+ FileContent =3D FileContent.decode('utf-16') >+ else: >+ FileContent =3D FileContent.decode() >+ except: >+ # The file is not txt file. for example .mcb file >+ continue > IncludedFileList =3D gIncludePattern.findall(FileContent) > > for Inc in IncludedFileList: > Inc =3D Inc.strip() > Inc =3D os.path.normpath(Inc) >-- >2.18.0.windows.1