From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga12.intel.com (mga12.intel.com [192.55.52.136]) by mx.groups.io with SMTP id smtpd.web10.10583.1600858360342164366 for ; Wed, 23 Sep 2020 03:52:40 -0700 Authentication-Results: mx.groups.io; dkim=missing; spf=pass (domain: intel.com, ip: 192.55.52.136, mailfrom: bob.c.feng@intel.com) IronPort-SDR: 2Sxx84KV4xCf77nhOqMwQA4HPlyueWlinNv4Y4/C+a0HIlA3EZeQq1RH7MgoUYelbjeJXE2jzQ g43ayZu++5ew== X-IronPort-AV: E=McAfee;i="6000,8403,9752"; a="140325207" X-IronPort-AV: E=Sophos;i="5.77,293,1596524400"; d="scan'208";a="140325207" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by fmsmga106.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 23 Sep 2020 03:52:39 -0700 IronPort-SDR: 7BlDk7oF59tu4x9JdTljIEjdOe3zyMWkGxm79EhrOfdemF0Fusvo+I/j3bsVvvUbczw6YiyjBB l6t49uYJz3PA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.77,293,1596524400"; d="scan'208";a="347309081" Received: from shwdepsi1121.ccr.corp.intel.com ([10.239.158.66]) by FMSMGA003.fm.intel.com with ESMTP; 23 Sep 2020 03:52:38 -0700 From: "Bob Feng" To: devel@edk2.groups.io Cc: Mingyue Liang , Liming Gao , Yuwei Chen Subject: [PATCH] BaseTools: Add included files to deps_target file. Date: Wed, 23 Sep 2020 18:52:26 +0800 Message-Id: <20200923105226.46336-1-bob.c.feng@intel.com> X-Mailer: git-send-email 2.20.1.windows.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: Mingyue Liang REF: https://bugzilla.tianocore.org/show_bug.cgi?id=2882 After changing the name of the include source file, when doing incremental build, the previous source file is not covered in the. DEPs file, and a build error occurs. The root cause is that the build tools filter out some dependency files, which are listed in inf source section, from the deps_target file. Add those files back to deps_target file to resolve the above problem. Signed-off-by: Mingyue Liang Cc: Bob Feng Cc: Liming Gao Cc: Yuwei Chen --- BaseTools/Source/Python/AutoGen/IncludesAutoGen.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/BaseTools/Source/Python/AutoGen/IncludesAutoGen.py b/BaseTools/Source/Python/AutoGen/IncludesAutoGen.py index 720d93395a..c3e6333217 100644 --- a/BaseTools/Source/Python/AutoGen/IncludesAutoGen.py +++ b/BaseTools/Source/Python/AutoGen/IncludesAutoGen.py @@ -103,7 +103,7 @@ ${END} if os.path.normpath(dependency_file +".deps") == abspath: continue filename = os.path.basename(dependency_file).strip() - if filename not in self.SourceFileList and filename not in targetname: + if filename not in targetname: includes.add(dependency_file.strip()) for item in lines[1:]: @@ -116,8 +116,6 @@ ${END} if os.path.normpath(dependency_file +".deps") == abspath: continue filename = os.path.basename(dependency_file).strip() - if filename in self.SourceFileList: - continue if filename in targetname: continue includes.add(dependency_file.strip()) -- 2.28.0.windows.1