From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: mx.groups.io; dkim=missing; spf=pass (domain: intel.com, ip: 192.55.52.115, mailfrom: zhijux.fan@intel.com) Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by groups.io with SMTP; Sun, 05 May 2019 22:20:09 -0700 X-Amp-Result: UNKNOWN X-Amp-Original-Verdict: FILE UNKNOWN X-Amp-File-Uploaded: False Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by fmsmga103.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 05 May 2019 22:20:09 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.60,435,1549958400"; d="dat'59?scan'59,208,59";a="146691209" Received: from fmsmsx106.amr.corp.intel.com ([10.18.124.204]) by fmsmga008.fm.intel.com with ESMTP; 05 May 2019 22:20:09 -0700 Received: from fmsmsx158.amr.corp.intel.com (10.18.116.75) by FMSMSX106.amr.corp.intel.com (10.18.124.204) with Microsoft SMTP Server (TLS) id 14.3.408.0; Sun, 5 May 2019 22:20:08 -0700 Received: from shsmsx108.ccr.corp.intel.com (10.239.4.97) by fmsmsx158.amr.corp.intel.com (10.18.116.75) with Microsoft SMTP Server (TLS) id 14.3.408.0; Sun, 5 May 2019 22:20:08 -0700 Received: from shsmsx101.ccr.corp.intel.com ([169.254.1.129]) by SHSMSX108.ccr.corp.intel.com ([169.254.8.126]) with mapi id 14.03.0415.000; Mon, 6 May 2019 13:19:40 +0800 From: "Fan, ZhijuX" To: "devel@edk2.groups.io" CC: "Gao, Liming" , "Feng, Bob C" Subject: [PATCH] BaseTools:Optimize code to support C files with different suffixes Thread-Topic: [PATCH] BaseTools:Optimize code to support C files with different suffixes Thread-Index: AdUDy0wPPhDtFgvzQ0OMbRAI+5iTKg== Date: Mon, 6 May 2019 05:19:39 +0000 Message-ID: Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: dlp-product: dlpe-windows dlp-version: 11.0.600.7 dlp-reaction: no-action x-originating-ip: [10.239.127.40] MIME-Version: 1.0 Return-Path: zhijux.fan@intel.com X-Groupsio-MsgNum: 40029 Content-Type: multipart/mixed; boundary="_000_FAD0D7E0AE0FA54D987F6E72435CAFD50AF5BBF8SHSMSX101ccrcor_" Content-Language: en-US --_000_FAD0D7E0AE0FA54D987F6E72435CAFD50AF5BBF8SHSMSX101ccrcor_ Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable BZ: https://bugzilla.tianocore.org/show_bug.cgi?id=3D1773 Build break if C file suffixes of named .C Under certain circumstances. Some programs do not recognize filenames with uppercase suffixes. This patch is going to fix that issue. Cc: Bob Feng Cc: Liming Gao Signed-off-by: Zhiju.Fan --- BaseTools/Source/Python/AutoGen/GenMake.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/BaseTools/Source/Python/AutoGen/GenMake.py b/BaseTools/Source/= Python/AutoGen/GenMake.py index 0e0f9fd9b0..858ddedf8e 100644 --- a/BaseTools/Source/Python/AutoGen/GenMake.py +++ b/BaseTools/Source/Python/AutoGen/GenMake.py @@ -1035,7 +1035,8 @@ cleanlib: CmdTargetDict[CmdSign] =3D "%s %s" % (CmdTargetDic= t[CmdSign], SingleCommandList[-1]) Index =3D CommandList.index(Item) CommandList.pop(Index) - if SingleCommandList[-1].endswith("%s%s.c" % (TAB_SLAS= H, CmdSumDict[CmdSign.lstrip('/Fo').rsplit(TAB_SLASH, 1)[0]])): + if SingleCommandList[-1].endswith("%s%s.c" % (TAB_SLAS= H, CmdSumDict[T.Target.SubDir])) or \ + SingleCommandList[-1].endswith("%s%s.C" % (TAB= _SLASH, CmdSumDict[T.Target.SubDir])): Cpplist =3D CmdCppDict[T.Target.SubDir] Cpplist.insert(0, '$(OBJLIST_%d): $(COMMON_DEPS)' = % list(self.ObjTargetDict.keys()).index(T.Target.SubDir)) T.Commands[Index] =3D '%s\n\t%s' % (' \\\n\t'.join= (Cpplist), CmdTargetDict[CmdSign]) --=20 2.14.1.windows.1 --_000_FAD0D7E0AE0FA54D987F6E72435CAFD50AF5BBF8SHSMSX101ccrcor_ Content-Disposition: attachment; filename="winmail.dat" Content-Transfer-Encoding: base64 Content-Type: application/ms-tnef; name="winmail.dat" eJ8+IitaAQaQCAAEAAAAAAABAAEAAQeQBgAIAAAA5AQAAAAAAADoAAEJgAEAIQAAADYwREZFRDlC NjJBNkVFNEU5MENDNjkzMDMxNEY5QTVEAGgHAQ2ABAACAAAAAgACAAEFgAMADgAAAOMHBQAGAAUA EwAnAAEANQEBIIADAA4AAADjBwUABgAFABMAJwABADUBAQiABwAYAAAASVBNLk1pY3Jvc29mdCBN YWlsLk5vdGUAMQgBBIABAEsAAABbUEFUQ0hdIEJhc2VUb29sczpPcHRpbWl6ZSBjb2RlIHRvIHN1 cHBvcnQgQyBmaWxlcyB3aXRoIGRpZmZlcmVudCBzdWZmaXhlcwAwGwELgAEAIQAAADYwREZFRDlC NjJBNkVFNEU5MENDNjkzMDMxNEY5QTVEAGgHAQOQBgCkDgAAMwAAAAIBfwABAAAASAAAADxGQUQw RDdFMEFFMEZBNTREOTg3RjZFNzI0MzVDQUZENTBBRjVCQkY4QFNIU01TWDEwMS5jY3IuY29ycC5p bnRlbC5jb20+AAsAHw4BAAAAAgEJEAEAAADCBAAAvgQAAGsIAABMWkZ1ygHuSWEACmZiaWQEAABj Y8BwZzEyNTIA/gND8HRleHQB9wKkA+MCAARjaArAc2V0MCDvB20CgwBQEU0yCoAGtAKAln0KgAjI OwliMTkOwL8JwxZyCjIWcQKAFWIqCbBzCfAEkGF0BbIOUANgc6JvAYAgRXgRwW4YMF0GUnYEkBe2 AhByAMB0fQhQbhoxECAFwAWgG2RkmiADUiAQIheyXHYIkOR3awuAZDUdUwTwB0ANF3AwCnEX8mJr bWsGcwGQACAgQk1fQuBFR0lOfQr8AfEL8SEfsFo6IGgCQHBzgDovL2J1Z3oDEEkLYC50BzBubwWh ZQIuBbBnL3Nob3eCXyJhLmNnaT8N0IA9MTc3M1xsC4BmZQqBJSRCdQMQHGBikQlwYWsgBpAgQxxw kwMQGeBzdQEgaXgHkbEZMCBuYQeAHGAuJuA+VR3AG7IbgQtxG9BpcihjdW0fYW4pAHMu7SUVUwNw GeBwA2AJwCgg6QQgZG8oAG8FQAlwBaD6ZwMAehngJwIoEgQgA/DAdGggdXBwBJAeUM8SACdHKlYl FVRoBAArEE8YgBHAJqAEIGdvC4Bn/xzAK8AngRzAEdAFQAQBClAJLt1DYyHAQm9iIFZGCfAw4DwG 4GIkUC7aZjORQAuAECBsJFADcJo+MplMB3AwwkdhK8DmPCUgNgIuZzZgNI8UwBZpLGAJgC0ZMGYt Ygp5IcBaL9BqdS5G6QORPHo5Yng0MABwN088Ci07wCUVH7AuEVRvOQbwcy8q0AhwKQAvUEZ5LYAC IC9BdRiQRzUJ8C8+MU0mgCNwcHmAIHwgMyArKzvnhjEm9BmUZCwgMiagCwCAG4FpAiBzKCspH0Dw QBABAB5wQYIoLSl3JRwN4AEgIDvAJHAFQGHuLzx/PY8+l2JEn0WvPocnJRUdsRAwIDAKYGY5AQVw OWIwLi44NcQ4ZAEAZGY4GeAekXg2NDQ7WER/SF9JbwodP2ArR09Ob09/CkBAw0QQHpAzNSw3P1BU Q3Q4IFQBYx5wAHAlIGIOOjv2Vm9W5UNtZFSTCsAYMHREDlB0W1fxgThiXSA9ICIlBCDlWZAiWbAg KFf/WQNA8K84YBnAHnAIUG0DgWQ14HUfYFtUMF1C5lbvXcJJl0qTWWBcGS5KgyhJECCObV0PVztf aXBvcGBg/0qSQuZNQGRvZJAmsVu/XMLaLgnwZAPhLYAoWYFZkAMkUFnjVEFCX1NMeEFTSEDwWNIp wFiKLgVRYHQFESgnL0ZveCcpLhHwC1AtcGh6MdApWzBdXPApVeZQsD9tf2WPZp9nr2i/WLBULtVa ZC5pYGJYgHJssSfQfwrRdFBtD3WPbt9v73DyQ/9xT3Jfc2lV72GPLcAlIB9g/18iWkB98Xp/c7J7 /30PfhMTYAFBUigwQPAnJCgAT0JKTElTVF8UJWRs0CCDcENPTQBNT05fREVQUywpJ1nxfiIoEgBs ZlAuT2JqWmguPsB5/0HAbMBgBXrNbMCAT4ntesDZXBVzW17TWUInWZB0UP8LkAyAWZCFQmrAdEJ0 UYyC+CcuajCxWiB+BEHxWj8PWQNj101AJRUyLjE0/ZGQLgPwHcAj8CpAAFAlKwMVQpOgAAAfAEIA AQAAABgAAABGAGEAbgAsACAAWgBoAGkAagB1AFgAAAAfAGUAAQAAACoAAAB6AGgAaQBqAHUAeAAu AGYAYQBuAEAAaQBuAHQAZQBsAC4AYwBvAG0AAAAAAB8AZAABAAAACgAAAFMATQBUAFAAAAAAAAIB QQABAAAAZAAAAAAAAACBKx+kvqMQGZ1uAN0BD1QCAAAAgEYAYQBuACwAIABaAGgAaQBqAHUAWAAA AFMATQBUAFAAAAB6AGgAaQBqAHUAeAAuAGYAYQBuAEAAaQBuAHQAZQBsAC4AYwBvAG0AAAAfAAJd AQAAACoAAAB6AGgAaQBqAHUAeAAuAGYAYQBuAEAAaQBuAHQAZQBsAC4AYwBvAG0AAAAAAB8A5V8B AAAAMgAAAHMAaQBwADoAegBoAGkAagB1AHgALgBmAGEAbgBAAGkAbgB0AGUAbAAuAGMAbwBtAAAA AAAfABoMAQAAABgAAABGAGEAbgAsACAAWgBoAGkAagB1AFgAAAAfAB8MAQAAACoAAAB6AGgAaQBq AHUAeAAuAGYAYQBuAEAAaQBuAHQAZQBsAC4AYwBvAG0AAAAAAB8AHgwBAAAACgAAAFMATQBUAFAA AAAAAAIBGQwBAAAAZAAAAAAAAACBKx+kvqMQGZ1uAN0BD1QCAAAAgEYAYQBuACwAIABaAGgAaQBq AHUAWAAAAFMATQBUAFAAAAB6AGgAaQBqAHUAeAAuAGYAYQBuAEAAaQBuAHQAZQBsAC4AYwBvAG0A AAAfAAFdAQAAACoAAAB6AGgAaQBqAHUAeAAuAGYAYQBuAEAAaQBuAHQAZQBsAC4AYwBvAG0AAAAA AB8A+D8BAAAAGAAAAEYAYQBuACwAIABaAGgAaQBqAHUAWAAAAB8AI0ABAAAAKgAAAHoAaABpAGoA dQB4AC4AZgBhAG4AQABpAG4AdABlAGwALgBjAG8AbQAAAAAAHwAiQAEAAAAKAAAAUwBNAFQAUAAA AAAAAgH5PwEAAABkAAAAAAAAAIErH6S+oxAZnW4A3QEPVAIAAACARgBhAG4ALAAgAFoAaABpAGoA dQBYAAAAUwBNAFQAUAAAAHoAaABpAGoAdQB4AC4AZgBhAG4AQABpAG4AdABlAGwALgBjAG8AbQAA AB8ACV0BAAAAKgAAAHoAaABpAGoAdQB4AC4AZgBhAG4AQABpAG4AdABlAGwALgBjAG8AbQAAAAAA CwBAOgEAAAAfABoAAQAAABIAAABJAFAATQAuAE4AbwB0AGUAAAAAAAMA8T8JBAAACwBAOgEAAAAD AP0/5AQAAAIBCzABAAAAEAAAAGDf7Ztipu5OkMxpMDFPml0DABcAAQAAAEAAOQCAJ3RNywPVAUAA CDCrnIFNywPVAR8AAICGAwIAAAAAAMAAAAAAAABGAQAAAB4AAABhAGMAYwBlAHAAdABsAGEAbgBn AHUAYQBnAGUAAAAAAAEAAAAMAAAAZQBuAC0AVQBTAAAAHwA3AAEAAACWAAAAWwBQAEEAVABDAEgA XQAgAEIAYQBzAGUAVABvAG8AbABzADoATwBwAHQAaQBtAGkAegBlACAAYwBvAGQAZQAgAHQAbwAg AHMAdQBwAHAAbwByAHQAIABDACAAZgBpAGwAZQBzACAAdwBpAHQAaAAgAGQAaQBmAGYAZQByAGUA bgB0ACAAcwB1AGYAZgBpAHgAZQBzAAAAAAAfAD0AAQAAAAIAAAAAAAAAAwA2AAAAAAACAXEAAQAA ABYAAAAB1QPLTA8+EO0WC/NDQ4xtEAj7mJMqAAAfAHAAAQAAAJYAAABbAFAAQQBUAEMASABdACAA QgBhAHMAZQBUAG8AbwBsAHMAOgBPAHAAdABpAG0AaQB6AGUAIABjAG8AZABlACAAdABvACAAcwB1 AHAAcABvAHIAdAAgAEMAIABmAGkAbABlAHMAIAB3AGkAdABoACAAZABpAGYAZgBlAHIAZQBuAHQA IABzAHUAZgBmAGkAeABlAHMAAAAAAB8ANRABAAAAkAAAADwARgBBAEQAMABEADcARQAwAEEARQAw AEYAQQA1ADQARAA5ADgANwBGADYARQA3ADIANAAzADUAQwBBAEYARAA1ADAAQQBGADUAQgBCAEYA OABAAFMASABTAE0AUwBYADEAMAAxAC4AYwBjAHIALgBjAG8AcgBwAC4AaQBuAHQAZQBsAC4AYwBv AG0APgAAAAMA3j+fTgAAQAAHMOfZfE3LA9UBAgELAAEAAAAQAAAAYN/tm2Km7k6QzGkwMU+aXQMA JgAAAAAAAgFHAAEAAAAyAAAAYz1VUzthPU1DSTtwPUludGVsO2w9U0hTTVNYMTAxLTE5MDUwNjA1 MTkzOVotNDgwMwAAAAIBEDABAAAARgAAAAAAAAAmd705O+w4SaSmFT3LpXtCBwD60Nfgrg+lTZh/ bnJDXK/VAAAARBFeAACmk2g2iHZsS6dK0+tHmkxkAAAJVI9iAAAAAB8A+j8BAAAAGAAAAEYAYQBu ACwAIABaAGgAaQBqAHUAWAAAAAMACVkBAAAAQAAAgAggBgAAAAAAwAAAAAAAAEYAAAAAv4UAAFCT FkzLA9UBCwAAgAggBgAAAAAAwAAAAAAAAEYAAAAAgoUAAAAAAAAfAACAhgMCAAAAAADAAAAAAAAA RgEAAAAYAAAAZABsAHAALQBwAHIAbwBkAHUAYwB0AAAAAQAAABoAAABkAGwAcABlAC0AdwBpAG4A ZABvAHcAcwAAAAAAHwAAgIYDAgAAAAAAwAAAAAAAAEYBAAAAGAAAAGQAbABwAC0AdgBlAHIAcwBp AG8AbgAAAAEAAAAWAAAAMQAxAC4AMAAuADYAMAAwAC4ANwAAAAAAHwAAgIYDAgAAAAAAwAAAAAAA AEYBAAAAGgAAAGQAbABwAC0AcgBlAGEAYwB0AGkAbwBuAAAAAAABAAAAFAAAAG4AbwAtAGEAYwB0 AGkAbwBuAAAAAwANNP0/AAAfAACAhgMCAAAAAADAAAAAAAAARgEAAAAgAAAAeAAtAG0AcwAtAGgA YQBzAC0AYQB0AHQAYQBjAGgAAAABAAAAAgAAAAAAAAAfAACAhgMCAAAAAADAAAAAAAAARgEAAAAi AAAAeAAtAG8AcgBpAGcAaQBuAGEAdABpAG4AZwAtAGkAcAAAAAAAAQAAACAAAABbADEAMAAuADIA MwA5AC4AMQAyADcALgA0ADAAXQAAALgr --_000_FAD0D7E0AE0FA54D987F6E72435CAFD50AF5BBF8SHSMSX101ccrcor_--