[edk2-devel] [Patch v3 04/22] BaseTools/tools_def.template: Add RC_PATH define

[Michael D Kinney]

Liming,

Thanks.  I have addressed this in a V4 branch I have prepared.

Mike

> -----Original Message-----
> From: Gao, Liming <liming.gao at intel.com>
> Sent: Tuesday, November 5, 2019 12:18 AM
> To: Kinney, Michael D <michael.d.kinney at intel.com>;
> devel at edk2.groups.io
> Cc: Sean Brogan <sean.brogan at microsoft.com>; Feng, Bob C
> <bob.c.feng at intel.com>
> Subject: RE: [Patch v3 04/22]
> BaseTools/tools_def.template: Add RC_PATH define
> 
> 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.
> 
> Thanks
> Liming
> >-----Original Message-----
> >From: Kinney, Michael D
> >Sent: Wednesday, October 30, 2019 3:55 AM
> >To: devel at edk2.groups.io
> >Cc: Sean Brogan <sean.brogan at microsoft.com>; Feng, Bob
> C
> ><bob.c.feng at intel.com>; Gao, Liming
> <liming.gao at intel.com>; Kinney,
> >Michael D <michael.d.kinney at intel.com>
> >Subject: [Patch v3 04/22] BaseTools/tools_def.template:
> Add RC_PATH
> >define
> >
> >From: Sean Brogan <sean.brogan at microsoft.com>
> >
> >https://bugzilla.tianocore.org/show_bug.cgi?id=2315
> >
> >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 <bob.c.feng at intel.com>
> >Cc: Liming Gao <liming.gao at intel.com>
> >Signed-off-by: Kinney <michael.d.kinney at intel.com>
> >---
> > 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.<BR>  #  Copyright (c) 2015, Hewlett-Packard
> Development
> >Company, L.P.<BR>  #  (C) Copyright 2016 Hewlett
> Packard Enterprise
> >Development LP<BR>
> >+#  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=2.00
> >
> > IDENTIFIER = Default TOOL_CHAIN_CONF
> >
> >@@ -71,6 +80,11 @@ DEFINE VS2019_BIN_X64     =
> >DEF(VS2019_BIN)\HostDEF(VS_HOST)\x64
> > DEFINE VS2019_BIN_ARM     =
> DEF(VS2019_BIN)\HostDEF(VS_HOST)\arm
> > DEFINE VS2019_BIN_AARCH64 =
> >DEF(VS2019_BIN)\HostDEF(VS_HOST)\arm64
> >
> >+#
> >+# Resource compiler
> >+#
> >+DEFINE RC_PATH    = ENV(WINSDK_PATH_FOR_RC_EXE)\rc.exe
> >+
> > DEFINE WINSDK_BIN           = ENV(WINSDK_PREFIX)
> > DEFINE WINSDKx86_BIN        = ENV(WINSDKx86_PREFIX)
> >
> >@@ -1566,7 +1580,7 @@ NOOPT_VS2015x86_X64_DLINK_FLAGS
> =
> >/NOLOGO /NODEFAULTLIB /IGNORE:4001 /OPT:REF
> >
> > *_VS2017_*_MAKE_PATH       =
> DEF(VS2017_BIN_HOST)\nmake.exe
> > *_VS2017_*_MAKE_FLAG       = /nologo
> >-*_VS2017_*_RC_PATH         = DEF(WINSDK10_BIN)\rc.exe
> >+*_VS2017_*_RC_PATH         = DEF(RC_PATH)
> >
> > *_VS2017_*_MAKE_FLAGS      = /nologo
> > *_VS2017_*_SLINK_FLAGS     = /NOLOGO /LTCG
> >@@ -1729,7 +1743,7 @@ NOOPT_VS2017_AARCH64_DLINK_FLAGS
> =
> >/NOLOGO /NODEFAULTLIB /IGNORE:4001 /OPT:REF
> >
> > *_VS2019_*_MAKE_PATH       =
> DEF(VS2019_BIN_HOST)\nmake.exe
> > *_VS2019_*_MAKE_FLAG       = /nologo
> >-*_VS2019_*_RC_PATH         = DEF(WINSDK10_BIN)\rc.exe
> >+*_VS2019_*_RC_PATH         = DEF(RC_PATH)
> >
> > *_VS2019_*_MAKE_FLAGS      = /nologo
> > *_VS2019_*_SLINK_FLAGS     = /NOLOGO /LTCG
> >--
> >2.21.0.windows.1


-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.

View/Reply Online (#50106): https://edk2.groups.io/g/devel/message/50106
Mute This Topic: https://groups.io/mt/39614159/1813853
Group Owner: devel+owner at edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub  [edk2-devel-archive at redhat.com]
-=-=-=-=-=-=-=-=-=-=-=-