From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by mx.groups.io with SMTP id smtpd.web12.6455.1625708542097950606 for ; Wed, 07 Jul 2021 18:42:22 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@intel.onmicrosoft.com header.s=selector2-intel-onmicrosoft-com header.b=BsualFUl; spf=pass (domain: intel.com, ip: 192.55.52.88, mailfrom: bob.c.feng@intel.com) X-IronPort-AV: E=McAfee;i="6200,9189,10038"; a="231172555" X-IronPort-AV: E=Sophos;i="5.84,222,1620716400"; d="scan'208";a="231172555" Received: from orsmga005.jf.intel.com ([10.7.209.41]) by fmsmga101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 07 Jul 2021 18:42:19 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.84,222,1620716400"; d="scan'208";a="628273828" Received: from fmsmsx606.amr.corp.intel.com ([10.18.126.86]) by orsmga005.jf.intel.com with ESMTP; 07 Jul 2021 18:42:19 -0700 Received: from fmsmsx608.amr.corp.intel.com (10.18.126.88) by fmsmsx606.amr.corp.intel.com (10.18.126.86) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2242.10; Wed, 7 Jul 2021 18:42:18 -0700 Received: from FMSEDG603.ED.cps.intel.com (10.1.192.133) by fmsmsx608.amr.corp.intel.com (10.18.126.88) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2242.10 via Frontend Transport; Wed, 7 Jul 2021 18:42:18 -0700 Received: from NAM12-DM6-obe.outbound.protection.outlook.com (104.47.59.171) by edgegateway.intel.com (192.55.55.68) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.2242.4; Wed, 7 Jul 2021 18:42:18 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=UlcV98IjrDZipHyICDvntnfeK46oeK8znHu2G0r+eABfXB5+mqwQg+gZKTxWK6xTSDAwfpS3XLpTLEEcOGvYhsFvwU8m1e0LjjUuF/aONNQe6/PdCbTo47bj6jL2yiekOag8ZCL3O/+xobPnI0o9WES1sAIRn7+Ebev9cloEodaBNhrv9zgdC00JBhb+lIkb+qZ7XNAagghiDlV8O1BtcGSmMQ/8rQiLwQ1fCbgsc0Mk89pWUSe2T9j3Cyex7w0urLzREmJDLsJJFjv93ph+x5kGNQy3Kv/GOWXmgaYfXA7tUcnGvg+mpViKfQ6rOnVM4G9G/5JL33Q/pG7ot0gG4A== 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=bm4qCjAAGpWF54eIycxrIqgnV64XTLQHH3q/cdWyvDA=; b=fDlbdkNXxvhvgn2LL+Bp0AgZwpdkIuU/2HhDPy1wYPrPUf2fiBjcWgYo2Bp67dG7Idd62MPdPnaITQ7MKcV5aFegJUcHWt//tycnJrKyt7pYov3yNESHPmuZdp+OkNksdjgoaGSuneiPfUmRJPzBDxs5ATlywfEzTx7Xu7U2Eelg8LSgHsaTqLC2u//0GM9N6EpQa7Mwnu4OqeHH57TIRJt7pNgc4tWyYeRkB22MYV+W8eNkeACXamG7FlW6KAHTV69c+AJWBj7jgk3Eob+9aenD0DnK1a6LlZDs83nWFiE2YaStYs2fSZqf6KoN1ObZLew2XZEgcLqkmis32x2mZw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=intel.com; dmarc=pass action=none header.from=intel.com; dkim=pass header.d=intel.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=intel.onmicrosoft.com; s=selector2-intel-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=bm4qCjAAGpWF54eIycxrIqgnV64XTLQHH3q/cdWyvDA=; b=BsualFUlI+Ch8N3rvCvvShb0c3flQJyMhFv0J8p7XWUrrlj5TEcbJFyd+SpVMyxemy4eacuDButzeuakbnuwfvFFMJ6HUsgCzjrc+1dRKfp9rT1WSxS8bnMEr0UzqjgFPBZgXEm175gAmGnjcQgV7DZ6pzT5d0lZakVg8S5ttds= Received: from DM6PR11MB4073.namprd11.prod.outlook.com (2603:10b6:5:19f::22) by DM5PR11MB1674.namprd11.prod.outlook.com (2603:10b6:4:b::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4287.31; Thu, 8 Jul 2021 01:42:17 +0000 Received: from DM6PR11MB4073.namprd11.prod.outlook.com ([fe80::b9b5:523d:7195:4f6c]) by DM6PR11MB4073.namprd11.prod.outlook.com ([fe80::b9b5:523d:7195:4f6c%3]) with mapi id 15.20.4287.034; Thu, 8 Jul 2021 01:42:17 +0000 From: "Bob Feng" To: "Chen, Christine" , "devel@edk2.groups.io" CC: Liming Gao Subject: Re: [PATCH 1/1] BaseTools: Remove non-ascii character of StructurePcd comment Thread-Topic: [PATCH 1/1] BaseTools: Remove non-ascii character of StructurePcd comment Thread-Index: AQHXa/okSJtKe9xenUKOaJY2fqS9Oqs4XDYg Date: Thu, 8 Jul 2021 01:42:17 +0000 Message-ID: References: <20210628084644.539-1-yuwei.chen@intel.com> In-Reply-To: <20210628084644.539-1-yuwei.chen@intel.com> Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: authentication-results: intel.com; dkim=none (message not signed) header.d=none;intel.com; dmarc=none action=none header.from=intel.com; x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: af74c844-7b91-43c0-d7d1-08d941b19e72 x-ms-traffictypediagnostic: DM5PR11MB1674: x-ms-exchange-transport-forked: True x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:6790; x-ms-exchange-senderadcheck: 1 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: lB1s6pYBzmB1RAcknf5iOEMWrgfYgnnjeHkPwH28CrjPKaZUovws73fH//NHJ4hxu8E7f+a3r/7MUR06ZFUGPCSqr+O6YL7LW+bEh9UHDWdpUyG//lrIvF2UNkVEOFn47VLRuQj/XRfyt/n3xy/yMvKkfWXBhmf0X+5DewBI02YhZ9ekPmBL5Hpx4JE7xYceWZ0uel8QQgQLCNGnXfGdy5Rs+FWfbnZ37aVhm0xMAOPXW5WhN1lX4DyevSEhVLuigpuTp0eAHxQpiWRk6b4iVFyLV02PttYvzF81DJvjkXbYRmy5NAyyzFGzyDpAs6SOaoJiTWAomuwbC078jsW/CgmBw3TJ4JCoO7xwmSFcS12J3c86kSKiiPz1OdqFawtx5EB045iHQyeQJBM3Irxyf8+ORKdkjfHKg9d/xrcqN0Lmzehxe7Cl/bJZQYAz/X4fv4gmoIPJloaiSw9r41/z7Fxod5faxKLUEB4Zg6XsIhQc/Dwzqg85olmIGfO+JerdprXKNaKuqN1IZhshK86hdq7VpeM/Q962l9vx/Jx7Z6jdu6DTxfFtmkjyhdOrL2t3hvfCO4CWgTKdf0rRPbIYollY2XXDWkU/IMeJItKXpZZyAyoBTHzoIKgEkqMxGSdKEJ0MZTndEaK+mJGPrbi9uA== x-forefront-antispam-report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DM6PR11MB4073.namprd11.prod.outlook.com;PTR:;CAT:NONE;SFS:(39860400002)(376002)(366004)(136003)(346002)(396003)(2906002)(8936002)(7696005)(64756008)(478600001)(55016002)(26005)(6506007)(186003)(86362001)(33656002)(66946007)(9686003)(66556008)(5660300002)(122000001)(52536014)(8676002)(38100700002)(71200400001)(66476007)(66446008)(4326008)(83380400001)(316002)(53546011)(110136005)(76116006);DIR:OUT;SFP:1102; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?us-ascii?Q?Y73+jlNeLCsm9oKknjMltOA9+1uy3qrWWOum/kN/s15aDQcGKiWnLUi43yB8?= =?us-ascii?Q?wWiCatm/VeBRnwcbcS5PngQkCkNgnKq62rsOnKIaaC3aXii+EjorG+E7peYj?= =?us-ascii?Q?o227lErpOR+v/3sRWejEW35oti2/1Nz0JBTE+3hIm/RiFWKJ28OPWX8FkpKM?= =?us-ascii?Q?30sejgRrgb1oSQsmIOdbHtalzj/FF3ubiL12zWQsZTBUX26nYo1Cl4gkYJRh?= =?us-ascii?Q?b8+8S0vafLNrGR4J6eEILJupIMPdzPJOjIfo+/UcwdjdFAXzFtXoeUDSMSkD?= =?us-ascii?Q?ejsOlrTqMZsABNcNH8GB0z/92J8l2uiaNrSCJ9iQfaTLeuZ7n7EMJ9nAtXXK?= =?us-ascii?Q?8Fl9gn4UJW9jaIH+c38Ou/uNGxEvvGl6TUO20M7TvOzgslOwwJ7+1KbkLxsQ?= =?us-ascii?Q?HwTJObtnYDgzEMi5rQVyqYA/+SH+p9/B4dkjBoBbU9MjkHYEVd/+TIeC3p34?= =?us-ascii?Q?k/Nzy3OAI30r/+oTGR8VFD9NDf5L7YT7TWzHqDfv2JFyNRnsPbly+ffDsX5D?= =?us-ascii?Q?rN6i1bjzZ+uLxl6NcF2avCB2FDv1cfJLftrI5H/PaIEYoX92mNuOgVOlj1Ll?= =?us-ascii?Q?SutCj0WIGd+bR9EjQynI+jC+7326TKfllZkpj1BWG4xkykTPPDm3dZ7HigqH?= =?us-ascii?Q?B4HRwM+Gc0D+MDPR3OTuDmVCqcshLqZBm1iAs0MGZJwaFlYUdG3hsLqeymYH?= =?us-ascii?Q?SqNPvHsLO2S4h7VMNW8alwmgOvBQaU3VKrb2inbkBj2loeA066Q3C2CCzwhm?= =?us-ascii?Q?+BVoGbCKe39QAawqKc44S1nmWgrDn07v+g4NJuOZfQb4TVAP26ONclQwmd8i?= =?us-ascii?Q?vKAGtbBrwL2WRpLptOcWEd4lrmgb3H3GpNIBExPZw6H2SYWVWxwctCyvnnw8?= =?us-ascii?Q?rONFWNqYWn7MwUT3nN/QI+QuR8mompFrJDgYlBHaEuP7UOBjSrJzPtnSvfJo?= =?us-ascii?Q?1UR4RsPEvSFTwmgxLiZL/PmHz/Lc+AgNAN7GkWYVYuvt9vhMAUvwbG4CgF1s?= =?us-ascii?Q?CIKhLD2hPjsGjXIWz/AYYM9jeu4kgFWYmdB3zhhHLCTrABqk/7V2tjdIQBq5?= =?us-ascii?Q?pjCgh8ySmGJRnZBanX9KjoRQeC5pIoxw15t9Y+W+Gv6GT/rXZyu1FMYCmxiQ?= =?us-ascii?Q?QBpNQjwJ0MXJtsmBBGDtx8RWE1zXqQix3kUMjVLCsfmsF45fMuEKIAIO6gTt?= =?us-ascii?Q?0EXp1PgvZ0op/sok3FIkWWXe/fS3s8W4T9s5hoCqL8rwQ0anF0pGqNFgjsd8?= =?us-ascii?Q?c8hxCi1Yr0lu7Ofzm38FusJSRCvkwVKVxTTNbyiH/iRm8fjSsyYu7wl7FjuO?= =?us-ascii?Q?LEu+RWAjgEZhaGp0Nwohl9ui?= MIME-Version: 1.0 X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: DM6PR11MB4073.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: af74c844-7b91-43c0-d7d1-08d941b19e72 X-MS-Exchange-CrossTenant-originalarrivaltime: 08 Jul 2021 01:42:17.1909 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 46c98d88-e344-4ed4-8496-4ed7712e255d X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: SFMh4IraGiJdQMtcEPwaTbHyuo12ULun/s/RGDiTDtJgGB2XlmjjRPeHgo7usunAEsjIljbMXGOpN2ULd1XvRg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR11MB1674 Return-Path: bob.c.feng@intel.com X-OriginatorOrg: intel.com Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Reviewed-by: Bob Feng -----Original Message----- From: Chen, Christine =20 Sent: Monday, June 28, 2021 4:47 PM To: devel@edk2.groups.io Cc: Feng, Bob C ; Liming Gao Subject: [PATCH 1/1] BaseTools: Remove non-ascii character of StructurePcd = comment Currently, the ConvertFceToStructurePcd.py tool generate StructurePcd dsc f= ile with comments from UNI file including non-ascii character. Following DS= C spec, there should not have non-ascii character in DSC file. This patch r= emoves the non-ascii character when adding the comment and changes the circ= le R to (R). Signed-off-by: Yuwei Chen Cc: Bob Feng Cc: Liming Gao --- BaseTools/Scripts/ConvertFceToStructurePcd.py | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/BaseTools/Scripts/ConvertFceToStructurePcd.py b/BaseTools/Scri= pts/ConvertFceToStructurePcd.py index 2052db8c4b69..2baabf2dd521 100644 --- a/BaseTools/Scripts/ConvertFceToStructurePcd.py +++ b/BaseTools/Scripts/ConvertFceToStructurePcd.py @@ -284,7 +284,15 @@ class Config(object): line=3Dx.split('\n')[0] comment_list =3D value_re.findall(line) # the string \\... in "Q..= .." line comment_list[0] =3D comment_list[0].replace('//', '') - comment =3D comment_list[0].strip() + comment_ori =3D comment_list[0].strip() + comment =3D "" + for each in comment_ori: + if each !=3D " " and "\x21" > each or each > "\x7E": + if bytes(each, 'utf-16') =3D=3D b'\xff\xfe\xae\x00': + each =3D '(R)' + else: + each =3D "" + comment +=3D each line=3Dvalue_re.sub('',line) #delete \\... in "Q...." line list1=3Dline.split(' ') value=3Dself.value_parser(list1) -- 2.27.0.windows.1