From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: mx.groups.io; dkim=missing; spf=pass (domain: intel.com, ip: 134.134.136.100, mailfrom: zhijux.fan@intel.com) Received: from mga07.intel.com (mga07.intel.com [134.134.136.100]) by groups.io with SMTP; Tue, 07 May 2019 00:14:22 -0700 X-Amp-Result: UNSCANNABLE X-Amp-File-Uploaded: False Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by orsmga105.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 07 May 2019 00:14:16 -0700 X-ExtLoop1: 1 Received: from fmsmsx107.amr.corp.intel.com ([10.18.124.205]) by FMSMGA003.fm.intel.com with ESMTP; 07 May 2019 00:14:17 -0700 Received: from fmsmsx118.amr.corp.intel.com (10.18.116.18) by fmsmsx107.amr.corp.intel.com (10.18.124.205) with Microsoft SMTP Server (TLS) id 14.3.408.0; Tue, 7 May 2019 00:14:16 -0700 Received: from shsmsx152.ccr.corp.intel.com (10.239.6.52) by fmsmsx118.amr.corp.intel.com (10.18.116.18) with Microsoft SMTP Server (TLS) id 14.3.408.0; Tue, 7 May 2019 00:14:16 -0700 Received: from shsmsx101.ccr.corp.intel.com ([169.254.1.129]) by SHSMSX152.ccr.corp.intel.com ([169.254.6.18]) with mapi id 14.03.0415.000; Tue, 7 May 2019 15:14:14 +0800 From: "Fan, ZhijuX" To: "devel@edk2.groups.io" CC: "Gao, Liming" , "Feng, Bob C" Subject: [PATCH V2] BaseTools:corrected error message for the DatumType error Thread-Topic: [PATCH V2] BaseTools:corrected error message for the DatumType error Thread-Index: AdUEpGjFkIfrSrzWRqGESuc9+q5jWw== Date: Tue, 7 May 2019 07:14:14 +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: 40083 Content-Type: multipart/mixed; boundary="_000_FAD0D7E0AE0FA54D987F6E72435CAFD50AF5BF9CSHSMSX101ccrcor_" Content-Language: en-US --_000_FAD0D7E0AE0FA54D987F6E72435CAFD50AF5BF9CSHSMSX101ccrcor_ Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable BZ:https://bugzilla.tianocore.org/show_bug.cgi?id=3D1762 For structure Pcd, Its DatumType may be self-defined, If the PCD DatumType format is incorrect, this PCD DatumType error message is inappropriate. This patch corrects the error message. Cc: Bob Feng Cc: Liming Gao Signed-off-by: Zhiju.Fan --- BaseTools/Source/Python/Workspace/DscBuildData.py | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/BaseTools/Source/Python/Workspace/DscBuildData.py b/BaseTools/= Source/Python/Workspace/DscBuildData.py index 1d7a6a11b8..e998aa7270 100644 --- a/BaseTools/Source/Python/Workspace/DscBuildData.py +++ b/BaseTools/Source/Python/Workspace/DscBuildData.py @@ -943,9 +943,13 @@ class DscBuildData(PlatformBuildClassObject): EdkLogger.error('build', FORMAT_INVALID, ErrStr, File=3Dse= lf.MetaFile, Line=3DLineNo, ExtraData=3D"%s.%s" % (TokenSpaceGuid, Pcd= CName)) if PcdType in (MODEL_PCD_DYNAMIC_DEFAULT, MODEL_PCD_DYNAMIC_EX= _DEFAULT, MODEL_PCD_FIXED_AT_BUILD, MODEL_PCD_PATCHABLE_IN_MODULE): - if self._DecPcds[PcdCName, TokenSpaceGuid].DatumType.strip= () !=3D ValueList[1].strip(): - EdkLogger.error('build', FORMAT_INVALID, "Pcd datumtyp= e used in DSC file is not the same as its declaration in DEC file.", File= =3Dself.MetaFile, Line=3DLineNo, - ExtraData=3D"%s.%s|%s" % (TokenSpaceGuid, = PcdCName, Setting)) + if self._DecPcds[PcdCName, TokenSpaceGuid].BaseDatumType.s= trip() !=3D ValueList[1].strip(): + DecPcd =3D self._DecPcds[PcdCName, TokenSpaceGuid] + EdkLogger.error('build', FORMAT_INVALID, + "Pcd datumtype used in DSC file is not= the same as its declaration. DatumType:%s"%DecPcd.DatumType, + File=3Dself.MetaFile, Line=3DLineNo, + ExtraData=3D"Dsc:%s.%s|%s\n Dec:%s.= %s|%s|%s|%s" % (TokenSpaceGuid, PcdCName, Setting, TokenSpaceGuid, \ + PcdCName, DecPcd.DefaultValue, DecPcd.= DatumType, DecPcd.TokenValue)) if (TokenSpaceGuid + '.' + PcdCName) in GlobalData.gPlatformPcds: if GlobalData.gPlatformPcds[TokenSpaceGuid + '.' + PcdCName] != =3D ValueList[Index]: GlobalData.gPlatformPcds[TokenSpaceGuid + '.' + PcdCName] = =3D ValueList[Index] --=20 2.14.1.windows.1 --_000_FAD0D7E0AE0FA54D987F6E72435CAFD50AF5BF9CSHSMSX101ccrcor_ Content-Disposition: attachment; filename="winmail.dat" Content-Transfer-Encoding: base64 Content-Type: application/ms-tnef; name="winmail.dat" eJ8+Imp4AQaQCAAEAAAAAAABAAEAAQeQBgAIAAAA5AQAAAAAAADoAAEJgAEAIQAAAEE4NjQ4MDJB MkRENDE3NEQ5QURFQzUxRURFNEVFQzJCAHsHAQ2ABAACAAAAAgACAAEFgAMADgAAAOMHBQAHAAcA DgAOAAIAGwEBIIADAA4AAADjBwUABwAHAA4ADgACABsBAQiABwAYAAAASVBNLk1pY3Jvc29mdCBN YWlsLk5vdGUAMQgBBIABAEUAAABbUEFUQ0ggVjJdIEJhc2VUb29sczpjb3JyZWN0ZWQgZXJyb3Ig bWVzc2FnZSBmb3IgdGhlIERhdHVtVHlwZSBlcnJvcgCPGAELgAEAIQAAAEE4NjQ4MDJBMkRENDE3 NEQ5QURFQzUxRURFNEVFQzJCAHsHAQOQBgBsDwAANAAAAAIBfwABAAAASAAAADxGQUQwRDdFMEFF MEZBNTREOTg3RjZFNzI0MzVDQUZENTBBRjVCRjlDQFNIU01TWDEwMS5jY3IuY29ycC5pbnRlbC5j b20+AAsAHw4BAAAAAgEJEAEAAACBBQAAfQUAAPgLAABMWkZ1DzSfDWEACmZiaWQEAABjY8BwZzEy NTIA/gND8HRleHQB9wKkA+MCAARjaArAc2V0MCDvB20CgwBQEU0yCoAGtAKAln0KgAjIOwliMTkO wL8JwxZyCjIWcQKAFWIqCbBzCfAEkGF0BbIOUANgc6JvAYAgRXgRwW4YMF0GUnYEkBe2AhByAMB0 fQhQbhoxECAFwAWgG2RkmiADUiAQIheyXHYIkOR3awuAZDUdUwTwB0ANF3AwCnEX8mJrbWsGcwGQ ACAgQk1fQuBFR0lOfQr8AfEL8REfsFo6aAJAcHM6wC8vYnVnegMQC2AkLnQHMG5vBaFlLgEFsGcv c2hvd19BIlEuY2dpPw3QPagxNzYOwGwLgGUKgQ0lFEYFsR9gcnVjdAMIcBngUGNkLCBJCnQEIEQY gHVtVHnGcBngAMB5IGIZ4BIAeGxmLQEBJSEm4CUFScpmHMBoJqFDRCdJGuT2IAQAK1BuBaEJcCZg KSZ/KdArYSocBJADYAXAB4FzxmEZ0StjYXBwA2AvIGsHMBAgLiUMVCyyCrB0fxHAG9Er0wQgKdIt 2y+9Q4RjOh+wb2IgRgnwKGcgPAbgYiRALmZtNHFAC4AQIGwkQANwPh0zeUwHcAuANJBHYW/nNKAl EDbiLmc3QDVvFMA0aWco8S0ZMCiQYnmFNABaLLBqdS5GA5F0PHo6Qng1EABwOC8KLi08oCUFH7Bh EgBUbxEG8HMvUwhhY2UvzFB5KdACIC9XBbAfUEsKsD4xRATwQnUDEGRLJ1EiwHAoEHwgHpAg9itA xDypMRxwAxAZ4BmUXSbhNyuBEgAAIGkCIHPIKCspJvAzIAEAHnC5Q1QtKSUMDeABICA8oHMkYAVA YS89Xz5vP35if0Z/R49IniUFHbEQMECAZAA3YTZhMTFiOAAuLmU5OThhYY0BwDcSMB6RNjQ0PDj/ Rl9Kr0u/TMZAwUmfUS9SPwlMxkBARfA5NDMstjlAsFfiMUPwV6FjC2DzBBE/eihQC2AAMBrxP6Mi Q1kCT2JqK/EpOgM81lw+RWRrTG9nzRgwck5QLeIoJyJQP8ECJybwRk9STUFUgl8gIFZBTElEJvC6 RSvQUyYwXrFCET0oYvQuTRIQYWBSJvA2wBhQ8j1hkk5vKSZcP1xPEECDGHA/8j0iJXMuZYCgIiAl IChUYGsJ8DpTVfJHP7Am4SbBQ076YQeAKUTGY8sGkCayJ6MDC4BmAE1PREVMXwEqEV9EWU5BTUkC Q2qARUZBVUxUYybwaf9fRVhrD2phRhhJWEVqcF8RQlVJFkxfoWuoUF8QQ0hBaEJMRV8xX2uha1BF /1unUABjzWkBYKNqgAWQJsGcc1tnJibwZixdLidXBi4mIQUgKCkgIT08IFYHQApQNsAfYFsxf3Ug deVxD1yPXZ9erybwItcmwUQAJ2J0J7J1EgAcYPFpsURTQ0H0K2EjEAVA/ynSLmAHgFAQK3EnIQWB C2CXGHFDYX1jRX3ELiJgP99hT3fvhF9kf2WDfGW/Zsz/JvAGYAJANvFnp1Pgca9yv/9zz3TVVCJ1 T3Zfd22J/5FC/YuUII8giz+MT3TjkJ94//96D3sflV+an5tIfD99T35f1X9tLidIOobhJZNEdTj/ mY+jf6Q5gV+Cb6KvqG+FX89lYD9xoSGGpFxcA6CSJP+q56x0hw+IH4kilE4m8KtwP6dPsa+yWJPI oXYBEGF1/Gx0j0Oz6KH3s/atU49DD2evaPKtTUCwICcuJ9e5wWcnaaJHCQBiB0A/835nWiaTclu/ aMW7L7w1W6u477n8XY8MSU1SXbyv/8N2vi+/P8BPwVXB35VGT/GhJQUyLjE0ymAuA/B/HcAj4GWQ AFAlGxVCzHAAAAAfAEIAAQAAABgAAABGAGEAbgAsACAAWgBoAGkAagB1AFgAAAAfAGUAAQAAACoA AAB6AGgAaQBqAHUAeAAuAGYAYQBuAEAAaQBuAHQAZQBsAC4AYwBvAG0AAAAAAB8AZAABAAAACgAA AFMATQBUAFAAAAAAAAIBQQABAAAAZAAAAAAAAACBKx+kvqMQGZ1uAN0BD1QCAAAAgEYAYQBuACwA IABaAGgAaQBqAHUAWAAAAFMATQBUAFAAAAB6AGgAaQBqAHUAeAAuAGYAYQBuAEAAaQBuAHQAZQBs AC4AYwBvAG0AAAAfAAJdAQAAACoAAAB6AGgAaQBqAHUAeAAuAGYAYQBuAEAAaQBuAHQAZQBsAC4A YwBvAG0AAAAAAB8A5V8BAAAAMgAAAHMAaQBwADoAegBoAGkAagB1AHgALgBmAGEAbgBAAGkAbgB0 AGUAbAAuAGMAbwBtAAAAAAAfABoMAQAAABgAAABGAGEAbgAsACAAWgBoAGkAagB1AFgAAAAfAB8M AQAAACoAAAB6AGgAaQBqAHUAeAAuAGYAYQBuAEAAaQBuAHQAZQBsAC4AYwBvAG0AAAAAAB8AHgwB AAAACgAAAFMATQBUAFAAAAAAAAIBGQwBAAAAZAAAAAAAAACBKx+kvqMQGZ1uAN0BD1QCAAAAgEYA YQBuACwAIABaAGgAaQBqAHUAWAAAAFMATQBUAFAAAAB6AGgAaQBqAHUAeAAuAGYAYQBuAEAAaQBu AHQAZQBsAC4AYwBvAG0AAAAfAAFdAQAAACoAAAB6AGgAaQBqAHUAeAAuAGYAYQBuAEAAaQBuAHQA ZQBsAC4AYwBvAG0AAAAAAB8A+D8BAAAAGAAAAEYAYQBuACwAIABaAGgAaQBqAHUAWAAAAB8AI0AB AAAAKgAAAHoAaABpAGoAdQB4AC4AZgBhAG4AQABpAG4AdABlAGwALgBjAG8AbQAAAAAAHwAiQAEA AAAKAAAAUwBNAFQAUAAAAAAAAgH5PwEAAABkAAAAAAAAAIErH6S+oxAZnW4A3QEPVAIAAACARgBh AG4ALAAgAFoAaABpAGoAdQBYAAAAUwBNAFQAUAAAAHoAaABpAGoAdQB4AC4AZgBhAG4AQABpAG4A dABlAGwALgBjAG8AbQAAAB8ACV0BAAAAKgAAAHoAaABpAGoAdQB4AC4AZgBhAG4AQABpAG4AdABl AGwALgBjAG8AbQAAAAAACwBAOgEAAAAfABoAAQAAABIAAABJAFAATQAuAE4AbwB0AGUAAAAAAAMA 8T8JBAAACwBAOgEAAAADAP0/5AQAAAIBCzABAAAAEAAAAKhkgCot1BdNmt7FHt5O7CsDABcAAQAA AEAAOQAAp695pATVAUAACDBFCtt5pATVAR8AAICGAwIAAAAAAMAAAAAAAABGAQAAAB4AAABhAGMA YwBlAHAAdABsAGEAbgBnAHUAYQBnAGUAAAAAAAEAAAAMAAAAZQBuAC0AVQBTAAAAHwA3AAEAAACK AAAAWwBQAEEAVABDAEgAIABWADIAXQAgAEIAYQBzAGUAVABvAG8AbABzADoAYwBvAHIAcgBlAGMA dABlAGQAIABlAHIAcgBvAHIAIABtAGUAcwBzAGEAZwBlACAAZgBvAHIAIAB0AGgAZQAgAEQAYQB0 AHUAbQBUAHkAcABlACAAZQByAHIAbwByAAAAAAAfAD0AAQAAAAIAAAAAAAAAAwA2AAAAAAACAXEA AQAAABYAAAAB1QSkaMWQh+tKvNZGoYRK5z36rmNbAAAfAHAAAQAAAIoAAABbAFAAQQBUAEMASAAg AFYAMgBdACAAQgBhAHMAZQBUAG8AbwBsAHMAOgBjAG8AcgByAGUAYwB0AGUAZAAgAGUAcgByAG8A cgAgAG0AZQBzAHMAYQBnAGUAIABmAG8AcgAgAHQAaABlACAARABhAHQAdQBtAFQAeQBwAGUAIABl AHIAcgBvAHIAAAAAAB8ANRABAAAAkAAAADwARgBBAEQAMABEADcARQAwAEEARQAwAEYAQQA1ADQA RAA5ADgANwBGADYARQA3ADIANAAzADUAQwBBAEYARAA1ADAAQQBGADUAQgBGADkAQwBAAFMASABT AE0AUwBYADEAMAAxAC4AYwBjAHIALgBjAG8AcgBwAC4AaQBuAHQAZQBsAC4AYwBvAG0APgAAAAMA 3j+fTgAAQAAHMOOo2HmkBNUBAgELAAEAAAAQAAAAqGSAKi3UF02a3sUe3k7sKwMAJgAAAAAAAgFH AAEAAAAyAAAAYz1VUzthPU1DSTtwPUludGVsO2w9U0hTTVNYMTAxLTE5MDUwNzA3MTQxNFotNjM0 NAAAAAIBEDABAAAARgAAAAAAAAAmd705O+w4SaSmFT3LpXtCBwD60Nfgrg+lTZh/bnJDXK/VAAAA RBFeAACmk2g2iHZsS6dK0+tHmkxkAAAJVI9pAAAAAB8A+j8BAAAAGAAAAEYAYQBuACwAIABaAGgA aQBqAHUAWAAAAAMACVkBAAAAQAAAgAggBgAAAAAAwAAAAAAAAEYAAAAAv4UAABBuxXikBNUBCwAA gAggBgAAAAAAwAAAAAAAAEYAAAAAgoUAAAAAAAADAACACCAGAAAAAADAAAAAAAAARgAAAADrhQAA CQQAAB8AAICGAwIAAAAAAMAAAAAAAABGAQAAABgAAABkAGwAcAAtAHAAcgBvAGQAdQBjAHQAAAAB AAAAGgAAAGQAbABwAGUALQB3AGkAbgBkAG8AdwBzAAAAAAAfAACAhgMCAAAAAADAAAAAAAAARgEA AAAYAAAAZABsAHAALQB2AGUAcgBzAGkAbwBuAAAAAQAAABYAAAAxADEALgAwAC4ANgAwADAALgA3 AAAAAAAfAACAhgMCAAAAAADAAAAAAAAARgEAAAAaAAAAZABsAHAALQByAGUAYQBjAHQAaQBvAG4A AAAAAAEAAAAUAAAAbgBvAC0AYQBjAHQAaQBvAG4AAAADAA00/T8AAB8AAICGAwIAAAAAAMAAAAAA AABGAQAAACAAAAB4AC0AbQBzAC0AaABhAHMALQBhAHQAdABhAGMAaAAAAAEAAAACAAAAAAAAAB8A AICGAwIAAAAAAMAAAAAAAABGAQAAACIAAAB4AC0AbwByAGkAZwBpAG4AYQB0AGkAbgBnAC0AaQBw AAAAAAABAAAAIAAAAFsAMQAwAC4AMgAzADkALgAxADIANwAuADQAMABdAAAAe4U= --_000_FAD0D7E0AE0FA54D987F6E72435CAFD50AF5BF9CSHSMSX101ccrcor_--