From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) by mx.groups.io with SMTP id smtpd.web12.1013.1573086780105456405 for ; Wed, 06 Nov 2019 16:33:00 -0800 Authentication-Results: mx.groups.io; dkim=missing; spf=pass (domain: intel.com, ip: 192.55.52.43, mailfrom: michael.d.kinney@intel.com) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by fmsmga105.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 06 Nov 2019 16:32:59 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.68,276,1569308400"; d="scan'208";a="227661058" Received: from orsmsx102.amr.corp.intel.com ([10.22.225.129]) by fmsmga004.fm.intel.com with ESMTP; 06 Nov 2019 16:32:59 -0800 Received: from orsmsx111.amr.corp.intel.com (10.22.240.12) by ORSMSX102.amr.corp.intel.com (10.22.225.129) with Microsoft SMTP Server (TLS) id 14.3.439.0; Wed, 6 Nov 2019 16:32:59 -0800 Received: from orsmsx113.amr.corp.intel.com ([169.254.9.28]) by ORSMSX111.amr.corp.intel.com ([169.254.12.154]) with mapi id 14.03.0439.000; Wed, 6 Nov 2019 16:32:59 -0800 From: "Michael D Kinney" To: "Gao, Liming" , "devel@edk2.groups.io" , "Kinney, Michael D" CC: Sean Brogan , "Feng, Bob C" Subject: Re: [Patch v3 04/22] BaseTools/tools_def.template: Add RC_PATH define Thread-Topic: [Patch v3 04/22] BaseTools/tools_def.template: Add RC_PATH define Thread-Index: AQHVjpLZCMh+bjyntEexUer3NccXyqd8zCKAgAIcXuA= Date: Thu, 7 Nov 2019 00:32:59 +0000 Message-ID: References: <20191029195517.20028-1-michael.d.kinney@intel.com> <20191029195517.20028-5-michael.d.kinney@intel.com> <4A89E2EF3DFEDB4C8BFDE51014F606A14E5379E7@SHSMSX104.ccr.corp.intel.com> In-Reply-To: <4A89E2EF3DFEDB4C8BFDE51014F606A14E5379E7@SHSMSX104.ccr.corp.intel.com> Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: dlp-product: dlpe-windows dlp-version: 11.2.0.6 dlp-reaction: no-action x-originating-ip: [10.22.254.138] MIME-Version: 1.0 Return-Path: michael.d.kinney@intel.com Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Liming, Thanks. I have addressed this in a V4 branch I have prepared. Mike > -----Original Message----- > From: Gao, Liming > Sent: Tuesday, November 5, 2019 12:18 AM > To: Kinney, Michael D ; > devel@edk2.groups.io > Cc: Sean Brogan ; Feng, Bob C > > Subject: RE: [Patch v3 04/22] > BaseTools/tools_def.template: Add RC_PATH define >=20 > Mike: > To avoid the impact of the developer, we should update > edk2\BaseTools\set_vsprefix_envs.bat to auto set > WINSDK_PATH_FOR_RC_EXE env. >=20 > Thanks > Liming > >-----Original Message----- > >From: Kinney, Michael D > >Sent: Wednesday, October 30, 2019 3:55 AM > >To: devel@edk2.groups.io > >Cc: Sean Brogan ; Feng, Bob > C > >; Gao, Liming > ; Kinney, > >Michael D > >Subject: [Patch v3 04/22] BaseTools/tools_def.template: > Add RC_PATH > >define > > > >From: Sean Brogan > > > >https://bugzilla.tianocore.org/show_bug.cgi?id=3D2315 > > > >Add use of RC_PATH define that provides the path to the > resource > >compiler that is typically provided in a Windows SDK. > The path changes > >with different Windows SDK releases. This define is > set to the > >WINSDK_PATH_FOR_RC_EXE environment variable. This > environment variable > >must be set to the path to the currently installed > resource compiler > >(rc.exe). > > > >Cc: Bob Feng > >Cc: Liming Gao > >Signed-off-by: Kinney > >--- > > BaseTools/Conf/tools_def.template | 18 > ++++++++++++++++-- > > 1 file changed, 16 insertions(+), 2 deletions(-) > > > >diff --git a/BaseTools/Conf/tools_def.template > >b/BaseTools/Conf/tools_def.template > >index dce6c5875a..afa13a7cae 100755 > >--- a/BaseTools/Conf/tools_def.template > >+++ b/BaseTools/Conf/tools_def.template > >@@ -4,9 +4,18 @@ > > # Portions copyright (c) 2011 - 2014, ARM Ltd. All > rights > >reserved.
# Copyright (c) 2015, Hewlett-Packard > Development > >Company, L.P.
# (C) Copyright 2016 Hewlett > Packard Enterprise > >Development LP
> >+# Copyright (c) Microsoft Corporation > > # > > # SPDX-License-Identifier: BSD-2-Clause-Patent # > >+# > >+# Increase this version tag any time you want user to > get warning > >+about > >updating this > >+# file in the Conf dir. By default it does not do > update existing conf dirs. > >+# > >+# 2.00 - Initial version with changes for CI > >+# - Change RC path to use plugin > >+# > >+#!VERSION=3D2.00 > > > > IDENTIFIER =3D Default TOOL_CHAIN_CONF > > > >@@ -71,6 +80,11 @@ DEFINE VS2019_BIN_X64 =3D > >DEF(VS2019_BIN)\HostDEF(VS_HOST)\x64 > > DEFINE VS2019_BIN_ARM =3D > DEF(VS2019_BIN)\HostDEF(VS_HOST)\arm > > DEFINE VS2019_BIN_AARCH64 =3D > >DEF(VS2019_BIN)\HostDEF(VS_HOST)\arm64 > > > >+# > >+# Resource compiler > >+# > >+DEFINE RC_PATH =3D ENV(WINSDK_PATH_FOR_RC_EXE)\rc.exe > >+ > > DEFINE WINSDK_BIN =3D ENV(WINSDK_PREFIX) > > DEFINE WINSDKx86_BIN =3D ENV(WINSDKx86_PREFIX) > > > >@@ -1566,7 +1580,7 @@ NOOPT_VS2015x86_X64_DLINK_FLAGS > =3D > >/NOLOGO /NODEFAULTLIB /IGNORE:4001 /OPT:REF > > > > *_VS2017_*_MAKE_PATH =3D > DEF(VS2017_BIN_HOST)\nmake.exe > > *_VS2017_*_MAKE_FLAG =3D /nologo > >-*_VS2017_*_RC_PATH =3D DEF(WINSDK10_BIN)\rc.exe > >+*_VS2017_*_RC_PATH =3D DEF(RC_PATH) > > > > *_VS2017_*_MAKE_FLAGS =3D /nologo > > *_VS2017_*_SLINK_FLAGS =3D /NOLOGO /LTCG > >@@ -1729,7 +1743,7 @@ NOOPT_VS2017_AARCH64_DLINK_FLAGS > =3D > >/NOLOGO /NODEFAULTLIB /IGNORE:4001 /OPT:REF > > > > *_VS2019_*_MAKE_PATH =3D > DEF(VS2019_BIN_HOST)\nmake.exe > > *_VS2019_*_MAKE_FLAG =3D /nologo > >-*_VS2019_*_RC_PATH =3D DEF(WINSDK10_BIN)\rc.exe > >+*_VS2019_*_RC_PATH =3D DEF(RC_PATH) > > > > *_VS2019_*_MAKE_FLAGS =3D /nologo > > *_VS2019_*_SLINK_FLAGS =3D /NOLOGO /LTCG > >-- > >2.21.0.windows.1