From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) (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 1492E20082E60 for ; Tue, 6 Jun 2017 19:12:05 -0700 (PDT) Received: from orsmga001.jf.intel.com ([10.7.209.18]) by fmsmga101.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 06 Jun 2017 19:13:12 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.39,309,1493708400"; d="scan'208";a="1138714614" Received: from fmsmsx108.amr.corp.intel.com ([10.18.124.206]) by orsmga001.jf.intel.com with ESMTP; 06 Jun 2017 19:13:10 -0700 Received: from fmsmsx111.amr.corp.intel.com (10.18.116.5) by FMSMSX108.amr.corp.intel.com (10.18.124.206) with Microsoft SMTP Server (TLS) id 14.3.319.2; Tue, 6 Jun 2017 19:13:09 -0700 Received: from shsmsx152.ccr.corp.intel.com (10.239.6.52) by fmsmsx111.amr.corp.intel.com (10.18.116.5) with Microsoft SMTP Server (TLS) id 14.3.319.2; Tue, 6 Jun 2017 19:13:09 -0700 Received: from shsmsx102.ccr.corp.intel.com ([169.254.2.146]) by SHSMSX152.ccr.corp.intel.com ([169.254.6.122]) with mapi id 14.03.0319.002; Wed, 7 Jun 2017 10:13:07 +0800 From: "Gao, Liming" To: "Zhu, Yonghong" , "edk2-devel@lists.01.org" Thread-Topic: [Patch] BaseTools: Fix incremental build failure that override file be removed Thread-Index: AQHS3swthhdS/SIL8Ei4byg6zi5Y5aIYqZEg Date: Wed, 7 Jun 2017 02:13:06 +0000 Message-ID: <4A89E2EF3DFEDB4C8BFDE51014F606A14D746787@shsmsx102.ccr.corp.intel.com> References: <1496757155-15452-1-git-send-email-yonghong.zhu@intel.com> In-Reply-To: <1496757155-15452-1-git-send-email-yonghong.zhu@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] BaseTools: Fix incremental build failure that override file be removed X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 07 Jun 2017 02:12:05 -0000 Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Reviewed-by: Liming Gao >-----Original Message----- >From: Zhu, Yonghong >Sent: Tuesday, June 06, 2017 9:53 PM >To: edk2-devel@lists.01.org >Cc: Gao, Liming >Subject: [Patch] BaseTools: Fix incremental build failure that override fi= le be >removed > >Fix a Incremental build failure. The case is: Both A and B package will >include a same .h file, and in the driver's packages section, A >package is listed before B package, so we will use the .h file in the A >package and build success, then we directly delete the .h file in package >A, it cause increment build failure since in the AutoGenTimeStamp file >the .h file in A can't be found. > >Cc: Liming Gao >Contributed-under: TianoCore Contribution Agreement 1.0 >Signed-off-by: Yonghong Zhu >--- > BaseTools/Source/Python/AutoGen/AutoGen.py | 2 ++ > 1 file changed, 2 insertions(+) > >diff --git a/BaseTools/Source/Python/AutoGen/AutoGen.py >b/BaseTools/Source/Python/AutoGen/AutoGen.py >index e89b61d..356eb21 100644 >--- a/BaseTools/Source/Python/AutoGen/AutoGen.py >+++ b/BaseTools/Source/Python/AutoGen/AutoGen.py >@@ -4208,10 +4208,12 @@ class ModuleAutoGen(AutoGen): > return False > > with open(self.GetTimeStampPath(),'r') as f: > for source in f: > source =3D source.rstrip('\n') >+ if not os.path.exists(source): >+ return False > if source not in ModuleAutoGen.TimeDict : > ModuleAutoGen.TimeDict[source] =3D os.stat(source)[8] > if ModuleAutoGen.TimeDict[source] > DstTimeStamp: > return False > return True >-- >2.6.1.windows.1