From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from NAM12-MW2-obe.outbound.protection.outlook.com (NAM12-MW2-obe.outbound.protection.outlook.com [40.92.23.13]) by mx.groups.io with SMTP id smtpd.web10.5358.1602364910940370721 for ; Sat, 10 Oct 2020 14:21:51 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@outlook.com header.s=selector1 header.b=tZuiC0xS; spf=pass (domain: outlook.com, ip: 40.92.23.13, mailfrom: michael.kubacki@outlook.com) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=VFtYa8kpLbMn7T7k2ZvUdLCv0DWBto0zrOKTugTJyNGryeoIPDV/SlXa+JEow9Lo3pKSfBlsyMbnRa3Km6JhKaITg+L85Fa9kwmXXeTRhlNacd/JZtQ+kKpPwS9GfpBHCBH6dGFMoFpKItivb1kYjFX3moqYkSlEU4+FB3Bz3Wznd6UolZeRVH830R4KvokOKxeJJUOcsDlqne+OSuwuHu+9TJY9ep4R4lBrNIJ+mce2H8fv3Yu3xPmg4MdsuU5uHsZFUn6z9HDxtbv1H8SuS9hqNIKVIc54MOMxBFe6minBVPrZtjnmp7znmD4lHV2OoFF2Ow2Rqt/jdjRRTTuqpA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=SHoRIw3vEdeMz0FdmvChAI/7yaIhV8XQDQ9G0freqq0=; b=WS87tHdwIbCsxEbDDx/ApjF7jN1cc8+N0jeXu4DRWzcJXYUyqXPjxLDdgCnFivSJdtpcesfcH8F5Ey2eJx7f2FNOIzIuFhCUjMU4SSWbMG8vXMu5MRstW+JDhQLbEdTzpHcUCdtln4l5UKhDCQ9wEuOeskVGT5fz/IU6mGUwQiLDOHhXeWz+VvyjHtonhma7ygWKEoVssbJtwrimmhrni1XkcczphBOFpZWVCKwpPrkQpi7qsR0v6DaHTpiw9+l8ZOed8fuMSBk2dngf63YjpXDtvxLeYxINOq38KMrHkZJdfMFJ9KdXp8zLWmMOU0TLhsKBoZeBhMPYwTZXI8EUIw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=outlook.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=SHoRIw3vEdeMz0FdmvChAI/7yaIhV8XQDQ9G0freqq0=; b=tZuiC0xSGXEm2ZbqrdDjEN0/1/ftIn1zharAyBXGaRdC88J2Ir9TdVybAfC0yPWxhXAGmMSZzhl7P6VBKlK03BwbihbIjX7eei2ngwqMFgasktXmEnTLjLifXlJH76qEZSTvNAIF81gu8KLhr73JF8FjZinyqf2//GwCrULLRQzGFN/C3h9U+RUSoSFPr68gXGJ+41fbNoyP76rGYUT1VZ0l0kIY6ZPIZdUyy5F3JE4JN+5l6/9Mp+ajy2W/OzCRW47+jzbnWeLx90fEV3+VMWnCQBNaxE+bwxoCCb/SIhCKte4Hoksf2/a92yV0u82SCOU8NfQoAJrkpGpDtJ5H4g== Received: from DM6NAM12FT058.eop-nam12.prod.protection.outlook.com (2a01:111:e400:fc64::41) by DM6NAM12HT088.eop-nam12.prod.protection.outlook.com (2a01:111:e400:fc64::380) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3477.11; Sat, 10 Oct 2020 21:21:49 +0000 Received: from MWHPR07MB3440.namprd07.prod.outlook.com (2a01:111:e400:fc64::43) by DM6NAM12FT058.mail.protection.outlook.com (2a01:111:e400:fc64::461) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3477.11 via Frontend Transport; Sat, 10 Oct 2020 21:21:49 +0000 X-IncomingTopHeaderMarker: OriginalChecksum:10E72ED9E20D83318BDC17A26252752B9ECCC276FE8EB1A0DD52B12BC0B55D14;UpperCasedChecksum:08AF0CA6DC2AB1F9F1D972E67CF5A3FA4047D150916A9D89BE3D833E8B8249B6;SizeAsReceived:8836;Count:48 Received: from MWHPR07MB3440.namprd07.prod.outlook.com ([fe80::eda9:ccc8:2ef:2471]) by MWHPR07MB3440.namprd07.prod.outlook.com ([fe80::eda9:ccc8:2ef:2471%7]) with mapi id 15.20.3433.049; Sat, 10 Oct 2020 21:21:49 +0000 Subject: Re: [edk2-devel] [PATCH] BaseTools: Add EDKII_DSC_PLATFORM_GUID MACRO To: devel@edk2.groups.io, fengyunhua@byosoft.com.cn Cc: gaoliming@byosoft.com.cn, bob.c.feng@intel.com References: <000001d69eb2$6f3eeb10$4dbcc130$@byosoft.com.cn> From: "Michael Kubacki" Message-ID: Date: Sat, 10 Oct 2020 14:21:49 -0700 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:68.0) Gecko/20100101 Thunderbird/68.12.1 In-Reply-To: <000001d69eb2$6f3eeb10$4dbcc130$@byosoft.com.cn> X-TMN: [R9YCbUcNSDrGV7rLtUtr6jNmOzNNEKHnp0WqkuXctd+NwwmwapjX2+ZwG+n4WD9i] X-ClientProxiedBy: CO2PR05CA0069.namprd05.prod.outlook.com (2603:10b6:102:2::37) To MWHPR07MB3440.namprd07.prod.outlook.com (2603:10b6:301:69::28) Return-Path: michael.kubacki@outlook.com X-Microsoft-Original-Message-ID: MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from [IPv6:2001:4898:d8:39:8d89:b554:9df1:a0ba] (2001:4898:80e8:3:daf:b554:9df1:a0ba) by CO2PR05CA0069.namprd05.prod.outlook.com (2603:10b6:102:2::37) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3412.6 via Frontend Transport; Sat, 10 Oct 2020 21:21:49 +0000 X-MS-PublicTrafficType: Email X-IncomingHeaderCount: 48 X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-Correlation-Id: 9d229ec9-eb30-457b-3225-08d86d627ffc X-MS-TrafficTypeDiagnostic: DM6NAM12HT088: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: asNoDu1qCabwzw8rBa3MNw46yPrWCOHreB0PEQMxG5syQ8kiKr760XGXDsRwYLrX+0BxDq4F2/yVDzTETdNDCCessrQnvwE1xK8BgVUHgVfhwWaBTQWw2vRoBH2tLHGMXajHUUaU156Z7SnavyFO+u/QszSjhRV8P0A6rgyixkY2fXWxo2Tt55C3c6UYMxtETXxp+qONWff8edd9e4nxN7E/03nYMb0RmkQGj7LBjdmBE42iuit56Qyu4v9dnSOy X-MS-Exchange-AntiSpam-MessageData: o6Shgnfi4p2Sn/LfsyWJ8lMDrde/Ra/y3A0hGliXK+15t127eO4sWcvqMq1qSOoBck4zcwTw+lUiof0CfE0O78QLHMTxCkq0DbWeWV9GtVP+D32kRcjt/4czbaYfj5dYs2fcIwW3Ei8Xz3VEsBgHFA5LN8bsLSoegw7Nzc0/CPmSeMCAmi++IOPXudWqmkt1GDwj8J+QeNArQ2dbc3OlZw== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 9d229ec9-eb30-457b-3225-08d86d627ffc X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Oct 2020 21:21:49.7336 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-AuthSource: DM6NAM12FT058.eop-nam12.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: Internet X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6NAM12HT088 Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit Tested-by: Michael Kubacki It looks like you're only putting one space of indentation before the GUID is printed on the new line after EDKII_DSC_PLATFORM_GUID and there should be two. #define EDKII_DSC_PLATFORM_GUID \\\n %s Should be: #define EDKII_DSC_PLATFORM_GUID \\\n %s Two spaces before GUID: #define EFI_CALLER_ID_GUID \ {0x1652B3C2, 0xA7A1, 0x46AC, {0xAF, 0x93, 0xDD, 0x6D, 0xEE, 0x44, 0x66, 0x69}} One space before GUID: #define EDKII_DSC_PLATFORM_GUID \ {0xC29BB610, 0x84F9, 0x448D, {0xA7, 0xDD, 0x5A, 0x04, 0xC5, 0xA5, 0x4F, 0x52}} On 10/9/2020 8:07 PM, fengyunhua wrote: > REF: https://bugzilla.tianocore.org/show_bug.cgi?id=2969 > > Add EDKII_DSC_PLATFORM_GUID MACRO > > Cc: Bob Feng > Cc: Liming Gao > Signed-off-by: Yunhua Feng > --- > BaseTools/Source/Python/AutoGen/GenC.py | 3 +++ > 1 file changed, 3 insertions(+) > > diff --git a/BaseTools/Source/Python/AutoGen/GenC.py b/BaseTools/Source/Python/AutoGen/GenC.py > index 5e0d11e165..5b63d278be 100755 > --- a/BaseTools/Source/Python/AutoGen/GenC.py > +++ b/BaseTools/Source/Python/AutoGen/GenC.py > @@ -1980,12 +1980,14 @@ def CreateHeaderCode(Info, AutoGenC, AutoGenH): > AutoGenH.Append("#include \n") > > AutoGenH.Append('\nextern GUID gEfiCallerIdGuid;') > + AutoGenH.Append('\nextern GUID gEdkiiDscPlatformGuid;') > AutoGenH.Append('\nextern CHAR8 *gEfiCallerBaseName;\n\n') > > if Info.IsLibrary: > return > > AutoGenH.Append("#define EFI_CALLER_ID_GUID \\\n %s\n" % GuidStringToGuidStructureString(Info.Guid)) > + AutoGenH.Append("#define EDKII_DSC_PLATFORM_GUID \\\n %s\n" % GuidStringToGuidStructureString(Info.PlatformInfo.Guid)) > > if Info.IsLibrary: > return > @@ -2002,6 +2004,7 @@ def CreateHeaderCode(Info, AutoGenC, AutoGenH): > # Publish the CallerId Guid > # > AutoGenC.Append('\nGLOBAL_REMOVE_IF_UNREFERENCED GUID gEfiCallerIdGuid = %s;\n' % GuidStringToGuidStructureString(Info.Guid)) > + AutoGenC.Append('\nGLOBAL_REMOVE_IF_UNREFERENCED GUID gEdkiiDscPlatformGuid = %s;\n' % GuidStringToGuidStructureString(Info.PlatformInfo.Guid)) > AutoGenC.Append('\nGLOBAL_REMOVE_IF_UNREFERENCED CHAR8 *gEfiCallerBaseName = "%s";\n' % Info.Name) > > ## Create common code for header file >