From nobody Mon Feb 9 03:12:14 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) client-ip=66.175.222.12; envelope-from=bounce+27952+50341+1787277+3901457@groups.io; helo=web01.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+50341+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1573461681; cv=none; d=zoho.com; s=zohoarc; b=AdRLr+S6wdM6fhvf1gKabMUFeH/DD5Z6D9U0N003H/KD95sPXojhKp0sMcT/zuXVcTQaTPOPK+mPlfUVKGGZYIp38h6a2cbbBAovTUVM8722WRx/r+doEpYrso2mrGmxfNKF0aiKmrMvf/zWUk6BV1SyZOmoRu6DB+yQ4tJjyHg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1573461681; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Id:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To; bh=B7J438BYSOSus4E80EJxPm7dpyT49lSpqCmSnr3VBko=; b=V4LjWtdEA11tuN+BrJGl4GROqRa5kGmwRvb2rBlr4l3WWTEhG7o0cjAALdeKSpMca/uvswijmnmj7FtSW21lUOAgaWXCFGlieNxMeMOadmte25wX+74EIwhMD6O8MzEEqyIXQzV7JxODUq/ao4eL4HV0o+SG/78vjhne4W9K2vs= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=pass; spf=pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+50341+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) header.from= Received: from web01.groups.io (web01.groups.io [66.175.222.12]) by mx.zohomail.com with SMTPS id 1573461681076946.7399221273304; Mon, 11 Nov 2019 00:41:21 -0800 (PST) Return-Path: X-Received: by 127.0.0.2 with SMTP id kVI5YY1788612xS9BuxzIssY; Mon, 11 Nov 2019 00:41:20 -0800 X-Received: from mga01.intel.com (mga01.intel.com []) by mx.groups.io with SMTP id smtpd.web11.1593.1573461678580668089 for ; Mon, 11 Nov 2019 00:41:19 -0800 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by fmsmga101.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 11 Nov 2019 00:41:12 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.68,292,1569308400"; d="scan'208";a="234403642" X-Received: from mdkinney-mobl2.amr.corp.intel.com ([10.255.231.122]) by fmsmga002.fm.intel.com with ESMTP; 11 Nov 2019 00:41:12 -0800 From: "Michael D Kinney" To: devel@edk2.groups.io Cc: Sean Brogan , Bob Feng , Liming Gao Subject: [edk2-devel] [Patch v5 04/22] BaseTools: Add RC_PATH define for VS2017/2019 Date: Mon, 11 Nov 2019 00:40:49 -0800 Message-Id: <20191111084107.5368-5-michael.d.kinney@intel.com> In-Reply-To: <20191111084107.5368-1-michael.d.kinney@intel.com> References: <20191111084107.5368-1-michael.d.kinney@intel.com> MIME-Version: 1.0 Precedence: Bulk List-Unsubscribe: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,michael.d.kinney@intel.com X-Gm-Message-State: DkXrUGIhxTq1LiUSCBofK8URx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1573461680; bh=9kTPkyJlZHXgV/llo5XF+6VUEA/7/cZ0WuLlDdQ3YDo=; h=Cc:Date:From:Reply-To:Subject:To; b=W8wx0JAKEOnT3LPj+JtXqsWpFfjNAduSJvS9X/fUyfJS+DGv3cKA7p6PM0tWdy9O8zy PtVw1ZIeF+7uShoeYnflUzym5NC3yUJCloniSSDVUF1xAYO8Akb050j0Pvnc5HQ2njU1j XOltdkoHkKzmZSpkXYmLA9KbYGmMBnW6v8A= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Type: text/plain; charset="utf-8" From: Sean Brogan 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). Update set_vsprefix_envs.bat to set WINSDK_PATH_FOR_RC_EXE if a Windows SDK is detected. Cc: Bob Feng Cc: Liming Gao Signed-off-by: Michael D Kinney Reviewed-by: Liming Gao --- BaseTools/Conf/tools_def.template | 18 ++++++++++++++++-- BaseTools/set_vsprefix_envs.bat | 10 ++++++++++ 2 files changed, 26 insertions(+), 2 deletions(-) diff --git a/BaseTools/Conf/tools_def.template b/BaseTools/Conf/tools_def.t= emplate 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 up= dating this +# file in the Conf dir. By default it does not do update existing conf di= rs. +# +# 2.00 - Initial version with changes for CI +# - Change RC path to use plugin +# +#!VERSION=3D2.00 =20 IDENTIFIER =3D Default TOOL_CHAIN_CONF =20 @@ -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 =20 +# +# 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) =20 @@ -1566,7 +1580,7 @@ NOOPT_VS2015x86_X64_DLINK_FLAGS =3D /NOLOGO /NODEF= AULTLIB /IGNORE:4001 /OPT:REF =20 *_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) =20 *_VS2017_*_MAKE_FLAGS =3D /nologo *_VS2017_*_SLINK_FLAGS =3D /NOLOGO /LTCG @@ -1729,7 +1743,7 @@ NOOPT_VS2017_AARCH64_DLINK_FLAGS =3D /NOLOGO /NODEF= AULTLIB /IGNORE:4001 /OPT:REF =20 *_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) =20 *_VS2019_*_MAKE_FLAGS =3D /nologo *_VS2019_*_SLINK_FLAGS =3D /NOLOGO /LTCG diff --git a/BaseTools/set_vsprefix_envs.bat b/BaseTools/set_vsprefix_envs.= bat index 6dff25d930..9966a5a4ed 100644 --- a/BaseTools/set_vsprefix_envs.bat +++ b/BaseTools/set_vsprefix_envs.bat @@ -158,6 +158,11 @@ if defined VCToolsInstallDir ( ) ) ) +if not defined WINSDK_PATH_FOR_RC_EXE ( + if defined WINSDK10_PREFIX ( + set "WINSDK_PATH_FOR_RC_EXE=3D%WINSDK10_PREFIX%x86" + ) +) =20 :SetVS2017 if not defined VS150COMNTOOLS ( @@ -209,6 +214,11 @@ if defined VCToolsInstallDir ( ) ) ) +if not defined WINSDK_PATH_FOR_RC_EXE ( + if defined WINSDK10_PREFIX ( + set "WINSDK_PATH_FOR_RC_EXE=3D%WINSDK10_PREFIX%x86" + ) +) =20 :SetWinDDK if not defined WINDDK3790_PREFIX ( --=20 2.21.0.windows.1 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#50341): https://edk2.groups.io/g/devel/message/50341 Mute This Topic: https://groups.io/mt/52458140/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-