From nobody Sat Apr 20 01:12:37 2024 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+47107+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+47107+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1568182110; cv=none; d=zoho.com; s=zohoarc; b=N9+6O30+gX9FdFDWRsTk/BdTv9y8UtOVly3NB298HMAw3stHRwuxRP/3/iX/rW/7J4nCV7Y9n7V/SEWF7rv+MZNOizEDnNn7Va2KDTIzD5aCLZ73Z6pPYelD23rg7K2ZG2vNmLISMTcOVZpaU/2btynotVuf6h6cGjZaXZBIv5I= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1568182110; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Id:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To:ARC-Authentication-Results; bh=JKM2iknLY4FOJQVCntPbzppnsFTR3Ju0KJdDiO9s31k=; b=KWQd3BDgSY6baCjbQI7rbdceYBO2X3q/DkQUt86BIiBofl5VepMjNizgzsxAKE/nOvYOExwNYByAx+351LWCEw1jbm9NB8F0bx/nOWX901PaiAPass1H6UK4+ntqdjzPJadhxeg23M6AarPD2kFR7vsDu/F31GndtCPk9MABpMU= 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+47107+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 1568182110807517.9974868897917; Tue, 10 Sep 2019 23:08:30 -0700 (PDT) Return-Path: X-Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by groups.io with SMTP; Tue, 10 Sep 2019 23:08:29 -0700 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by orsmga103.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 10 Sep 2019 23:08:28 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.64,492,1559545200"; d="scan'208";a="209562906" X-Received: from chingjex-mobl.gar.corp.intel.com ([10.5.246.26]) by fmsmga004.fm.intel.com with ESMTP; 10 Sep 2019 23:08:26 -0700 From: "Cheng, Ching JenX" To: devel@edk2.groups.io Cc: Amy Chan , Bob Feng , Liming Gao Subject: [edk2-devel] [PATCH 1/2] Add VS2019 Toolchain def Date: Wed, 11 Sep 2019 14:08:03 +0800 Message-Id: <20190911060804.15728-2-ching.jenx.cheng@intel.com> In-Reply-To: <20190911060804.15728-1-ching.jenx.cheng@intel.com> References: <20190911060804.15728-1-ching.jenx.cheng@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,ching.jenx.cheng@intel.com Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1568182109; bh=LuDA8/UDTgTTDiX+CAKJk2IZ3Pw7O3oyLE180pqSU4A=; h=Cc:Date:From:Reply-To:Subject:To; b=nCBI8JKP1omJTl8nUpywfrExB6WmiZU+SJ/bHqA5OvstrMMqWlLgHUF49BmAWQmqB1C aDVKntQlZbdapL4HU4zNN/wNAjDSPtm75HIBA+U9aG3UnMhBU4dTE4avDjPjup9JHnJwY G6/nRE/zsgPytM5XxrhKVDBtp4rHg3ivfhA= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Type: text/plain; charset="utf-8" REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3D2182 In order to support VS2019, the first thing need to do is add 2019 toolchain on tools_def.template Change-Id: Id52abdc9762cf06bb9a38bbfd1153608c878d839 Cc: Amy Chan Cc: Bob Feng Cc: Liming Gao Signed-off-by: Ching JenX Cheng --- BaseTools/Conf/tools_def.template | 134 ++++++++++++++++++++++++++++++++++= +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++= +++++++++++++------------ 1 file changed, 122 insertions(+), 12 deletions(-) diff --git a/BaseTools/Conf/tools_def.template b/BaseTools/Conf/tools_def.t= emplate index 8f0e6cb6c2..7585a3e5db 100755 --- a/BaseTools/Conf/tools_def.template +++ b/BaseTools/Conf/tools_def.template @@ -63,27 +63,35 @@ DEFINE VS2017_BIN_X64 =3D DEF(VS2017_BIN)\HostDEF(V= S2017_HOST)\x64 DEFINE VS2017_BIN_ARM =3D DEF(VS2017_BIN)\HostDEF(VS2017_HOST)\arm DEFINE VS2017_BIN_AARCH64 =3D DEF(VS2017_BIN)\HostDEF(VS2017_HOST)\arm64 =20 -DEFINE WINSDK_BIN =3D ENV(WINSDK_PREFIX) -DEFINE WINSDKx86_BIN =3D ENV(WINSDKx86_PREFIX) +DEFINE VS2019_BIN =3D ENV(VS2019_PREFIX)bin +DEFINE VS2019_HOST =3D x86 +DEFINE VS2019_BIN_HOST =3D DEF(VS2019_BIN)\HostDEF(VS2019_HOST)\DEF(VS2= 019_HOST) +DEFINE VS2019_BIN_IA32 =3D DEF(VS2019_BIN)\HostDEF(VS2019_HOST)\x86 +DEFINE VS2019_BIN_X64 =3D DEF(VS2019_BIN)\HostDEF(VS2019_HOST)\x64 +DEFINE VS2019_BIN_ARM =3D DEF(VS2019_BIN)\HostDEF(VS2019_HOST)\arm +DEFINE VS2019_BIN_AARCH64 =3D DEF(VS2019_BIN)\HostDEF(VS2019_HOST)\arm64 + +DEFINE WINSDK_BIN =3D ENV(WINSDK_PREFIX) +DEFINE WINSDKx86_BIN =3D ENV(WINSDKx86_PREFIX) =20 # Microsoft Visual Studio 2010 -DEFINE WINSDK7_BIN =3D ENV(WINSDK7_PREFIX) -DEFINE WINSDK7x86_BIN =3D ENV(WINSDK7x86_PREFIX) +DEFINE WINSDK7_BIN =3D ENV(WINSDK7_PREFIX) +DEFINE WINSDK7x86_BIN =3D ENV(WINSDK7x86_PREFIX) =20 # Microsoft Visual Studio 2012 Update 1 (required for rc.exe that was not = included in the initial release) -DEFINE WINSDK71_BIN =3D ENV(WINSDK71_PREFIX) -DEFINE WINSDK71x86_BIN =3D ENV(WINSDK71x86_PREFIX) +DEFINE WINSDK71_BIN =3D ENV(WINSDK71_PREFIX) +DEFINE WINSDK71x86_BIN =3D ENV(WINSDK71x86_PREFIX) =20 # Microsoft Visual Studio 2013 Professional Edition -DEFINE WINSDK8_BIN =3D ENV(WINSDK8_PREFIX)x86\ -DEFINE WINSDK8x86_BIN =3D ENV(WINSDK8x86_PREFIX)x64 +DEFINE WINSDK8_BIN =3D ENV(WINSDK8_PREFIX)x86\ +DEFINE WINSDK8x86_BIN =3D ENV(WINSDK8x86_PREFIX)x64 =20 # Microsoft Visual Studio 2015 Professional Edition -DEFINE WINSDK81_BIN =3D ENV(WINSDK81_PREFIX)x86\ -DEFINE WINSDK81x86_BIN =3D ENV(WINSDK81x86_PREFIX)x64 +DEFINE WINSDK81_BIN =3D ENV(WINSDK81_PREFIX)x86\ +DEFINE WINSDK81x86_BIN =3D ENV(WINSDK81x86_PREFIX)x64 =20 -# Microsoft Visual Studio 2017 Professional Edition -DEFINE WINSDK10_BIN =3D ENV(WINSDK10_PREFIX)DEF(VS2017_HOST) +# Microsoft Visual Studio 2017/2019 Professional Edition +DEFINE WINSDK10_BIN =3D ENV(WINSDK10_PREFIX)DEF(VS2017_HOST) =20 # These defines are needed for certain Microsoft Visual Studio tools that # are used by other toolchains. An example is that ICC on Windows normally @@ -218,6 +226,17 @@ DEFINE DTC_BIN =3D ENV(DTC_PREFIX)dtc # Note: # Building of XIP firmware images for ARM/ARM6= 4 is not currently supported (only applications). # /FILEALIGN:4096 and other changes are needed= for ARM firmware builds. +# VS2019 -win32- Requires: +# Microsoft Visual Studio 2019 version 16.2 or= later +# Optional: +# Required to build EBC drivers: +# Intel(r) Compiler for Efi Byte Code (Intel= (r) EBC Compiler) +# Required to build platforms or ACPI tables: +# Intel(r) ACPI Compiler (iasl.exe) from +# https://acpica.org/downloads +# Note: +# Building of XIP firmware images for ARM/ARM6= 4 is not currently supported (only applications). +# /FILEALIGN:4096 and other changes are needed= for ARM firmware builds. # GCC48 -Linux,Windows- Requires: # GCC 4.8 targeting x86_64-linux-gnu, aarch64-= linux-gnu, or arm-linux-gnueabi # Optional: @@ -1691,6 +1710,97 @@ NOOPT_VS2017_AARCH64_DLINK_FLAGS =3D /NOLOGO /NODE= FAULTLIB /IGNORE:4001 /OPT:REF *_VS2017_EBC_SLINK_FLAGS =3D /lib /NOLOGO /MACHINE:EBC *_VS2017_EBC_DLINK_FLAGS =3D "C:\Program Files (x86)\Intel\EBC\Lib= \EbcLib.lib" /NOLOGO /NODEFAULTLIB /MACHINE:EBC /OPT:REF /ENTRY:$(IMAGE_ENT= RY_POINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /MAP /ALIGN:32 /DRIVER =20 +##########################################################################= ########## +# VS2019 - Microsoft Visual Studio 2017 with Intel ASL +# ASL - Intel ACPI Source Language Compiler (iasl.exe) +##########################################################################= ########## +# VS2019 - Microsoft Visual Studio 2017 professional Edition w= ith Intel ASL +*_VS2019_*_*_FAMILY =3D MSFT +*_VS2019_*_*_DLL =3D DEF(VS2019_BIN_HOST) + +*_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_*_MAKE_FLAGS =3D /nologo +*_VS2019_*_SLINK_FLAGS =3D /NOLOGO /LTCG +*_VS2019_*_APP_FLAGS =3D /nologo /E /TC +*_VS2019_*_PP_FLAGS =3D /nologo /E /TC /FIAutoGen.h +*_VS2019_*_VFRPP_FLAGS =3D /nologo /E /TC /DVFRCOMPILE /FI$(MODULE_NAM= E)StrDefs.h +*_VS2019_*_DLINK2_FLAGS =3D /WHOLEARCHIVE +*_VS2019_*_ASM16_PATH =3D DEF(VS2019_BIN_IA32)\ml.exe + +################## +# ASL definitions +################## +*_VS2019_*_ASL_PATH =3D DEF(WIN_IASL_BIN) +*_VS2019_*_ASL_FLAGS =3D DEF(DEFAULT_WIN_ASL_FLAGS) +*_VS2019_*_ASL_OUTFLAGS =3D DEF(DEFAULT_WIN_ASL_OUTFLAGS) +*_VS2019_*_ASLCC_FLAGS =3D DEF(MSFT_ASLCC_FLAGS) +*_VS2019_*_ASLPP_FLAGS =3D DEF(MSFT_ASLPP_FLAGS) +*_VS2019_*_ASLDLINK_FLAGS =3D DEF(MSFT_ASLDLINK_FLAGS) + +################## +# IA32 definitions +################## +*_VS2019_IA32_CC_PATH =3D DEF(VS2019_BIN_IA32)\cl.exe +*_VS2019_IA32_VFRPP_PATH =3D DEF(VS2019_BIN_IA32)\cl.exe +*_VS2019_IA32_ASLCC_PATH =3D DEF(VS2019_BIN_IA32)\cl.exe +*_VS2019_IA32_ASLPP_PATH =3D DEF(VS2019_BIN_IA32)\cl.exe +*_VS2019_IA32_SLINK_PATH =3D DEF(VS2019_BIN_IA32)\lib.exe +*_VS2019_IA32_DLINK_PATH =3D DEF(VS2019_BIN_IA32)\link.exe +*_VS2019_IA32_ASLDLINK_PATH=3D DEF(VS2019_BIN_IA32)\link.exe +*_VS2019_IA32_APP_PATH =3D DEF(VS2019_BIN_IA32)\cl.exe +*_VS2019_IA32_PP_PATH =3D DEF(VS2019_BIN_IA32)\cl.exe +*_VS2019_IA32_ASM_PATH =3D DEF(VS2019_BIN_IA32)\ml.exe + + *_VS2019_IA32_MAKE_FLAGS =3D /nologo + DEBUG_VS2019_IA32_CC_FLAGS =3D /nologo /arch:IA32 /c /WX /GS- /W4 /Gs= 32768 /D UNICODE /O1b2 /GL /FIAutoGen.h /EHs-c- /GR- /GF /Gy /Z7 /Gw /MP +RELEASE_VS2019_IA32_CC_FLAGS =3D /nologo /arch:IA32 /c /WX /GS- /W4 /Gs= 32768 /D UNICODE /O1b2 /GL /FIAutoGen.h /EHs-c- /GR- /GF /Gw /MP +NOOPT_VS2019_IA32_CC_FLAGS =3D /nologo /arch:IA32 /c /WX /GS- /W4 /Gs= 32768 /D UNICODE /FIAutoGen.h /EHs-c- /GR- /GF /Gy /Z7 /Od /MP + + DEBUG_VS2019_IA32_ASM_FLAGS =3D /nologo /c /WX /W3 /Cx /coff /Zd /Zi +RELEASE_VS2019_IA32_ASM_FLAGS =3D /nologo /c /WX /W3 /Cx /coff /Zd +NOOPT_VS2019_IA32_ASM_FLAGS =3D /nologo /c /WX /W3 /Cx /coff /Zd /Zi + + DEBUG_VS2019_IA32_NASM_FLAGS =3D -Ox -f win32 -g +RELEASE_VS2019_IA32_NASM_FLAGS =3D -Ox -f win32 +NOOPT_VS2019_IA32_NASM_FLAGS =3D -O0 -f win32 -g + + DEBUG_VS2019_IA32_DLINK_FLAGS =3D /NOLOGO /NODEFAULTLIB /IGNORE:4001 /OP= T:REF /OPT:ICF=3D10 /MAP /ALIGN:32 /SECTION:.xdata,D /SECTION:.pdata,D /MAC= HINE:X86 /LTCG /DLL /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:EFI_BOOT_SERVICE= _DRIVER /SAFESEH:NO /BASE:0 /DRIVER /DEBUG +RELEASE_VS2019_IA32_DLINK_FLAGS =3D /NOLOGO /NODEFAULTLIB /IGNORE:4001 /IG= NORE:4254 /OPT:REF /OPT:ICF=3D10 /MAP /ALIGN:32 /SECTION:.xdata,D /SECTION:= .pdata,D /MACHINE:X86 /LTCG /DLL /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:EFI= _BOOT_SERVICE_DRIVER /SAFESEH:NO /BASE:0 /DRIVER /MERGE:.rdata=3D.data +NOOPT_VS2019_IA32_DLINK_FLAGS =3D /NOLOGO /NODEFAULTLIB /IGNORE:4001 /OP= T:REF /OPT:ICF=3D10 /MAP /ALIGN:32 /SECTION:.xdata,D /SECTION:.pdata,D /MAC= HINE:X86 /LTCG /DLL /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:EFI_BOOT_SERVICE= _DRIVER /SAFESEH:NO /BASE:0 /DRIVER /DEBUG + +################## +# X64 definitions +################## +*_VS2019_X64_CC_PATH =3D DEF(VS2019_BIN_X64)\cl.exe +*_VS2019_X64_PP_PATH =3D DEF(VS2019_BIN_X64)\cl.exe +*_VS2019_X64_APP_PATH =3D DEF(VS2019_BIN_X64)\cl.exe +*_VS2019_X64_VFRPP_PATH =3D DEF(VS2019_BIN_X64)\cl.exe +*_VS2019_X64_ASLCC_PATH =3D DEF(VS2019_BIN_X64)\cl.exe +*_VS2019_X64_ASLPP_PATH =3D DEF(VS2019_BIN_X64)\cl.exe +*_VS2019_X64_ASM_PATH =3D DEF(VS2019_BIN_X64)\ml64.exe +*_VS2019_X64_SLINK_PATH =3D DEF(VS2019_BIN_X64)\lib.exe +*_VS2019_X64_DLINK_PATH =3D DEF(VS2019_BIN_X64)\link.exe +*_VS2019_X64_ASLDLINK_PATH =3D DEF(VS2019_BIN_X64)\link.exe + + DEBUG_VS2019_X64_CC_FLAGS =3D /nologo /c /WX /GS- /W4 /Gs32768 /D UN= ICODE /O1b2s /GL /Gy /FIAutoGen.h /EHs-c- /GR- /GF /Z7 /Gw /MP +RELEASE_VS2019_X64_CC_FLAGS =3D /nologo /c /WX /GS- /W4 /Gs32768 /D UN= ICODE /O1b2s /GL /Gy /FIAutoGen.h /EHs-c- /GR- /GF /Gw /MP +NOOPT_VS2019_X64_CC_FLAGS =3D /nologo /c /WX /GS- /W4 /Gs32768 /D UN= ICODE /Gy /FIAutoGen.h /EHs-c- /GR- /GF /Z7 /Od /MP + + DEBUG_VS2019_X64_ASM_FLAGS =3D /nologo /c /WX /W3 /Cx /Zd /Zi +RELEASE_VS2019_X64_ASM_FLAGS =3D /nologo /c /WX /W3 /Cx /Zd +NOOPT_VS2019_X64_ASM_FLAGS =3D /nologo /c /WX /W3 /Cx /Zd /Zi + + DEBUG_VS2019_X64_NASM_FLAGS =3D -Ox -f win64 -g +RELEASE_VS2019_X64_NASM_FLAGS =3D -Ox -f win64 +NOOPT_VS2019_X64_NASM_FLAGS =3D -O0 -f win64 -g + + DEBUG_VS2019_X64_DLINK_FLAGS =3D /NOLOGO /NODEFAULTLIB /IGNORE:4001 /IG= NORE:4281 /OPT:REF /OPT:ICF=3D10 /MAP /ALIGN:32 /SECTION:.xdata,D /SECTION:= .pdata,D /Machine:X64 /LTCG /DLL /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:EFI= _BOOT_SERVICE_DRIVER /SAFESEH:NO /BASE:0 /DRIVER /DEBUG +RELEASE_VS2019_X64_DLINK_FLAGS =3D /NOLOGO /NODEFAULTLIB /IGNORE:4001 /IG= NORE:4281 /IGNORE:4254 /OPT:REF /OPT:ICF=3D10 /MAP /ALIGN:32 /SECTION:.xdat= a,D /SECTION:.pdata,D /Machine:X64 /LTCG /DLL /ENTRY:$(IMAGE_ENTRY_POINT) /= SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /SAFESEH:NO /BASE:0 /DRIVER /MERGE:.rdata= =3D.data +NOOPT_VS2019_X64_DLINK_FLAGS =3D /NOLOGO /NODEFAULTLIB /IGNORE:4001 /IG= NORE:4281 /OPT:REF /OPT:ICF=3D10 /MAP /ALIGN:32 /SECTION:.xdata,D /SECTION:= .pdata,D /Machine:X64 /LTCG /DLL /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:EFI= _BOOT_SERVICE_DRIVER /SAFESEH:NO /BASE:0 /DRIVER /DEBUG + ##########################################################################= ########## # GCC Common ##########################################################################= ########## --=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 (#47107): https://edk2.groups.io/g/devel/message/47107 Mute This Topic: https://groups.io/mt/34100573/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- From nobody Sat Apr 20 01:12:37 2024 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+47108+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+47108+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1568182135; cv=none; d=zoho.com; s=zohoarc; b=l4MHMSi7IZQaFwDvNBzg7/c9KwxG3vL6zrZPay1K7QKlSlUhk6z2yxGZlfY4BZR/wCc1k2etclb730mISf2kFuR/+2ZWDYi07jQau/ExtS6hNwMNxYFTHFb9DuQrZ8MlT+HGXVMe2J64lHFNpCgf6pjHXgiXVBYAsm3ii9Fg1NE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1568182135; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Id:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To:ARC-Authentication-Results; bh=Q+Ab/9KhNGlA966XJwTQpHWbP1L8M2KEbBDkBR4xZG4=; b=WxkrZl8G0h92rXjM3EW68C9zLWcbE7izDgdhMxq3rP9QE8sfQshIoH5/RgmA1ZYYJ6WgbP92VkdWuq8jV/vZY9mXaVo6Lyy+Uf1P3/ykjrUhsz1WWbLlgjmMSQZjOhqmUbGclNvCf8DSy4EshewtWcO9BDxI/1DqQce6PE4MPro= 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+47108+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 1568182135049383.4172467666731; Tue, 10 Sep 2019 23:08:55 -0700 (PDT) Return-Path: X-Received: from mga18.intel.com (mga18.intel.com [134.134.136.126]) by groups.io with SMTP; Tue, 10 Sep 2019 23:08:54 -0700 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by orsmga106.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 10 Sep 2019 23:08:52 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.64,492,1559545200"; d="scan'208";a="209562984" X-Received: from chingjex-mobl.gar.corp.intel.com ([10.5.246.26]) by fmsmga004.fm.intel.com with ESMTP; 10 Sep 2019 23:08:51 -0700 From: "Cheng, Ching JenX" To: devel@edk2.groups.io Cc: Amy Chan , Bob Feng , Liming Gao Subject: [edk2-devel] [PATCH 2/2] Add VS2019 Support on ToolSetup Batches Date: Wed, 11 Sep 2019 14:08:04 +0800 Message-Id: <20190911060804.15728-3-ching.jenx.cheng@intel.com> In-Reply-To: <20190911060804.15728-1-ching.jenx.cheng@intel.com> References: <20190911060804.15728-1-ching.jenx.cheng@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,ching.jenx.cheng@intel.com Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1568182134; bh=muljkRGk9rgrAYOGdmne1EfEygFXtQ/7vAEw10rgwyk=; h=Cc:Date:From:Reply-To:Subject:To; b=dUKIt63JFUUsgg40UUE/LBG6RuOrdU6nthDZD6nvJyGaSZCR/UbKKeorp94kEjY4eM4 5CdbPknQIlqNYRoEdjim4ezZheLrMMM/qOmLPlhXL4IcohSSuwtMKoZS3lxHzuoyYfmYp eWy9f/My5NfFBwUwf2NenjE7porKb41rZrc= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Type: text/plain; charset="utf-8" REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3D2182 Inorder to support VS2019, we add VS2019 config process in Setup Batch Files, Because VS2019 and VS2017 could using same vswhere.exe to detect the InstallationPath, So we add the -version as the parameter of vswhere to get the correct VS2017/VS2019's InstallationPath Change-Id: I72d5ef66fd39d3d42b0b2ea57199b4fa27260ab6 Cc: Amy Chan Cc: Bob Feng Cc: Liming Gao Signed-off-by: Ching JenX Cheng --- BaseTools/get_vsvars.bat | 39 +++++++++++++++++++++++++++++++------= -- BaseTools/set_vsprefix_envs.bat | 70 +++++++++++++++++++++++++++++++++++++= ++++++++++++++++++++++++++++----- BaseTools/toolsetup.bat | 16 +++++++++++++--- edksetup.bat | 6 ++++-- 4 files changed, 113 insertions(+), 18 deletions(-) diff --git a/BaseTools/get_vsvars.bat b/BaseTools/get_vsvars.bat index 9f3759b2a9..60c3a2c0b7 100644 --- a/BaseTools/get_vsvars.bat +++ b/BaseTools/get_vsvars.bat @@ -1,7 +1,7 @@ @REM @file @REM Windows batch file to find the Visual Studio set up script @REM -@REM Copyright (c) 2013-2014, ARM Limited. All rights reserved. +@REM Copyright (c) 2013-2019, ARM Limited. All rights reserved. =20 @REM SPDX-License-Identifier: BSD-2-Clause-Patent @REM @@ -10,15 +10,21 @@ @echo off set SCRIPT_ERROR=3D0 if "%1"=3D=3D"" goto main +if /I "%1"=3D=3D"VS2019" goto VS2019Vars if /I "%1"=3D=3D"VS2017" goto VS2017Vars if /I "%1"=3D=3D"VS2015" goto VS2015Vars if /I "%1"=3D=3D"VS2013" goto VS2013Vars if /I "%1"=3D=3D"VS2012" goto VS2012Vars =20 :set_vsvars -for /f "usebackq tokens=3D1* delims=3D: " %%i in (`%*`) do ( - if /i "%%i"=3D=3D"installationPath" call "%%j\VC\Auxiliary\Build\vcvars3= 2.bat" -) +if defined VCINSTALLDIR goto :EOF + call %* > vswhereInfo + for /f "usebackq tokens=3D1* delims=3D: " %%i in (vswhereInfo) do ( + if /i "%%i"=3D=3D"installationPath" ( + call "%%j\VC\Auxiliary\Build\vcvars32.bat" + ) + ) + del vswhereInfo goto :EOF =20 :read_vsvars @@ -42,19 +48,36 @@ REM (Or invoke the relevant vsvars32 file beforeh= and). =20 :main if defined VCINSTALLDIR goto :done + :VS2019Vars + if exist "%ProgramFiles(x86)%\Microsoft Visual Studio\Installer\vswhere.= exe" ( + if exist "%ProgramFiles(x86)%\Microsoft Visual Studio\2019\BuildTools"= ( + call :set_vsvars "%ProgramFiles(x86)%\Microsoft Visual Studio\Instal= ler\vswhere.exe" -products Microsoft.VisualStudio.Product.BuildTools -versi= on 16,17 + ) else ( + call :set_vsvars "%ProgramFiles(x86)%\Microsoft Visual Studio\Instal= ler\vswhere.exe" -version 16,17 + ) + ) + if exist "%ProgramFiles%\Microsoft Visual Studio\Installer\vswhere.exe" ( + if exist "%ProgramFiles%\Microsoft Visual Studio\2019\BuildTools" ( + call :set_vsvars "%ProgramFiles%\Microsoft Visual Studio\Installer\v= swhere.exe" -products Microsoft.VisualStudio.Product.BuildTools -version 16= ,17 + ) else ( + call :set_vsvars "%ProgramFiles%\Microsoft Visual Studio\Installer\v= swhere.exe" -version 16,17 + ) + ) + if /I "%1"=3D=3D"VS2019" goto ToolNotInstall + :VS2017Vars if exist "%ProgramFiles(x86)%\Microsoft Visual Studio\Installer\vswhere.= exe" ( if exist "%ProgramFiles(x86)%\Microsoft Visual Studio\2017\BuildTools"= ( - call :set_vsvars "%ProgramFiles(x86)%\Microsoft Visual Studio\Instal= ler\vswhere.exe" -products Microsoft.VisualStudio.Product.BuildTools + call :set_vsvars "%ProgramFiles(x86)%\Microsoft Visual Studio\Instal= ler\vswhere.exe" -products Microsoft.VisualStudio.Product.BuildTools -versi= on 15,16 ) else ( - call :set_vsvars "%ProgramFiles(x86)%\Microsoft Visual Studio\Instal= ler\vswhere.exe" + call :set_vsvars "%ProgramFiles(x86)%\Microsoft Visual Studio\Instal= ler\vswhere.exe" -version 15,16 ) ) if exist "%ProgramFiles%\Microsoft Visual Studio\Installer\vswhere.exe" ( if exist "%ProgramFiles%\Microsoft Visual Studio\2017\BuildTools" ( - call :set_vsvars "%ProgramFiles%\Microsoft Visual Studio\Installer\v= swhere.exe" -products Microsoft.VisualStudio.Product.BuildTools + call :set_vsvars "%ProgramFiles%\Microsoft Visual Studio\Installer\v= swhere.exe" -products Microsoft.VisualStudio.Product.BuildTools -version 15= ,16 ) else ( - call :set_vsvars "%ProgramFiles%\Microsoft Visual Studio\Installer\v= swhere.exe" + call :set_vsvars "%ProgramFiles%\Microsoft Visual Studio\Installer\v= swhere.exe" -version 15,16 ) ) if /I "%1"=3D=3D"VS2017" goto ToolNotInstall diff --git a/BaseTools/set_vsprefix_envs.bat b/BaseTools/set_vsprefix_envs.= bat index 81686f5b63..46b84713a6 100644 --- a/BaseTools/set_vsprefix_envs.bat +++ b/BaseTools/set_vsprefix_envs.bat @@ -3,7 +3,7 @@ @REM however it may be executed directly from the BaseTools project fold= er @REM if the file is not executed within a WORKSPACE\BaseTools folder. @REM -@REM Copyright (c) 2016-2017, Intel Corporation. All rights reserved.
+@REM Copyright (c) 2016-2019, Intel Corporation. All rights reserved.
@REM @REM SPDX-License-Identifier: BSD-2-Clause-Patent @REM @@ -18,6 +18,7 @@ set SCRIPT_ERROR=3D1 goto :EOF =20 :main +if /I "%1"=3D=3D"VS2019" goto SetVS2019 if /I "%1"=3D=3D"VS2017" goto SetVS2017 if /I "%1"=3D=3D"VS2015" goto SetVS2015 if /I "%1"=3D=3D"VS2013" goto SetVS2013 @@ -107,27 +108,86 @@ if defined VS140COMNTOOLS ( ) if /I "%1"=3D=3D"VS2015" goto SetWinDDK =20 +:SetVS2019 +if not defined VS160COMNTOOLS ( + if exist "%ProgramFiles(x86)%\Microsoft Visual Studio\Installer\vswhere.= exe" ( + if exist "%ProgramFiles(x86)%\Microsoft Visual Studio\2019\BuildTools"= ( + call "%ProgramFiles(x86)%\Microsoft Visual Studio\Installer\vswhere.= exe" -products Microsoft.VisualStudio.Product.BuildTools -version 16,17 > v= swhereInfo + for /f "usebackq tokens=3D1* delims=3D: " %%i in (vswhereInfo) do ( + if /i "%%i"=3D=3D"installationPath" call "%%j\VC\Auxiliary\Build\v= cvars32.bat" + ) + del vswhereInfo + ) else ( + call "%ProgramFiles(x86)%\Microsoft Visual Studio\Installer\vswhere.= exe" -version 16,17 > vswhereInfo + for /f "usebackq tokens=3D1* delims=3D: " %%i in (vswhereInfo) do ( + if /i "%%i"=3D=3D"installationPath" call "%%j\VC\Auxiliary\Build\v= cvars32.bat" + ) + del vswhereInfo + ) + ) else if exist "%ProgramFiles%\Microsoft Visual Studio\Installer\vswher= e.exe" ( + if exist "%ProgramFiles%\Microsoft Visual Studio\2019\BuildTools" ( + call "%ProgramFiles%\Microsoft Visual Studio\Installer\vswhere.exe" = -products Microsoft.VisualStudio.Product.BuildTools -version 16,17 > vswher= eInfo + for /f "usebackq tokens=3D1* delims=3D: " %%i in (vswhereInfo) do ( + if /i "%%i"=3D=3D"installationPath" call "%%j\VC\Auxiliary\Build\v= cvars32.bat" + ) + del vswhereInfo + ) else ( + call "%ProgramFiles%\Microsoft Visual Studio\Installer\vswhere.exe" = -version 16,17 > vswhereInfo + for /f "usebackq tokens=3D1* delims=3D: " %%i in (vswhereInfo) do ( + if /i "%%i"=3D=3D"installationPath" call "%%j\VC\Auxiliary\Build\v= cvars32.bat" + ) + del vswhereInfo + ) + ) else ( + if /I "%1"=3D=3D"VS2019" goto ToolNotInstall + goto SetWinDDK + ) +) + +if defined VCToolsInstallDir ( + if not defined VS2019_PREFIX ( + set "VS2019_PREFIX=3D%VCToolsInstallDir%" + ) +) +if not defined WINSDK10_PREFIX ( + if defined WindowsSdkVerBinPath ( + set "WINSDK10_PREFIX=3D%WindowsSdkVerBinPath%" + ) else if exist "%ProgramFiles(x86)%\Windows Kits\10\bin" ( + set "WINSDK10_PREFIX=3D%ProgramFiles(x86)%\Windows Kits\10\bin\" + ) else if exist "%ProgramFiles%\Windows Kits\10\bin" ( + set "WINSDK10_PREFIX=3D%ProgramFiles%\Windows Kits\10\bin\" + ) +) + :SetVS2017 if not defined VS150COMNTOOLS ( if exist "%ProgramFiles(x86)%\Microsoft Visual Studio\Installer\vswhere.= exe" ( if exist "%ProgramFiles(x86)%\Microsoft Visual Studio\2017\BuildTools"= ( - for /f "usebackq tokens=3D1* delims=3D: " %%i in (`"%ProgramFiles(x8= 6)%\Microsoft Visual Studio\Installer\vswhere.exe" -products Microsoft.Visu= alStudio.Product.BuildTools`) do ( + call "%ProgramFiles(x86)%\Microsoft Visual Studio\Installer\vswhere.= exe" -products Microsoft.VisualStudio.Product.BuildTools -version 15,16 > v= swhereInfo + for /f "usebackq tokens=3D1* delims=3D: " %%i in (vswhereInfo) do ( if /i "%%i"=3D=3D"installationPath" call "%%j\VC\Auxiliary\Build\v= cvars32.bat" ) + del vswhereInfo ) else ( - for /f "usebackq tokens=3D1* delims=3D: " %%i in (`"%ProgramFiles(x8= 6)%\Microsoft Visual Studio\Installer\vswhere.exe"`) do ( + call "%ProgramFiles(x86)%\Microsoft Visual Studio\Installer\vswhere.= exe" -version 15,16 > vswhereInfo + for /f "usebackq tokens=3D1* delims=3D: " %%i in (vswhereInfo) do ( if /i "%%i"=3D=3D"installationPath" call "%%j\VC\Auxiliary\Build\v= cvars32.bat" ) + del vswhereInfo ) ) else if exist "%ProgramFiles%\Microsoft Visual Studio\Installer\vswher= e.exe" ( if exist "%ProgramFiles%\Microsoft Visual Studio\2017\BuildTools" ( - for /f "usebackq tokens=3D1* delims=3D: " %%i in (`"%ProgramFiles%\M= icrosoft Visual Studio\Installer\vswhere.exe" -products Microsoft.VisualStu= dio.Product.BuildTools`) do ( + call "%ProgramFiles%\Microsoft Visual Studio\Installer\vswhere.exe" = -products Microsoft.VisualStudio.Product.BuildTools -version 15,16 > vswher= eInfo + for /f "usebackq tokens=3D1* delims=3D: " %%i in (vswhereInfo) do ( if /i "%%i"=3D=3D"installationPath" call "%%j\VC\Auxiliary\Build\v= cvars32.bat" ) + del vswhereInfo ) else ( - for /f "usebackq tokens=3D1* delims=3D: " %%i in (`"%ProgramFiles%\M= icrosoft Visual Studio\Installer\vswhere.exe"`) do ( + call "%ProgramFiles%\Microsoft Visual Studio\Installer\vswhere.exe" = -version 15,16 > vswhereInfo + for /f "usebackq tokens=3D1* delims=3D: " %%i in (vswhereInfo) do ( if /i "%%i"=3D=3D"installationPath" call "%%j\VC\Auxiliary\Build\v= cvars32.bat" ) + del vswhereInfo ) ) else ( if /I "%1"=3D=3D"VS2017" goto ToolNotInstall diff --git a/BaseTools/toolsetup.bat b/BaseTools/toolsetup.bat index 395694fa09..61ebf4ae09 100755 --- a/BaseTools/toolsetup.bat +++ b/BaseTools/toolsetup.bat @@ -3,7 +3,7 @@ @REM however it may be executed directly from the BaseTools project fold= er @REM if the file is not executed within a WORKSPACE\BaseTools folder. @REM -@REM Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.
+@REM Copyright (c) 2006 - 2019, Intel Corporation. All rights reserved.
@REM (C) Copyright 2016 Hewlett Packard Enterprise Development LP
@REM @REM SPDX-License-Identifier: BSD-2-Clause-Patent @@ -42,6 +42,12 @@ if /I "%1"=3D=3D"/?" goto Usage set FORCE_REBUILD=3DTRUE goto loop ) + if /I "%1"=3D=3D"VS2019" ( + shift + set VS2019=3DTRUE + set VSTool=3DVS2019 + goto loop + ) if /I "%1"=3D=3D"VS2017" ( shift set VS2017=3DTRUE @@ -176,7 +182,9 @@ IF NOT exist "%EDK_TOOLS_PATH%\set_vsprefix_envs.bat" ( @echo. goto end ) -if defined VS2017 ( +if defined VS2019 ( + call %EDK_TOOLS_PATH%\set_vsprefix_envs.bat VS2019 +) else if defined VS2017 ( call %EDK_TOOLS_PATH%\set_vsprefix_envs.bat VS2017 ) else if defined VS2015 ( call %EDK_TOOLS_PATH%\set_vsprefix_envs.bat VS2015 @@ -444,7 +452,7 @@ goto end =20 :Usage @echo. - echo Usage: "%0 [-h | -help | --help | /h | /help | /?] [ Rebuild | For= ceRebuild ] [Reconfig] [base_tools_path [edk_tools_path]] [VS2017] [VS2015]= [VS2013] [VS2012]" + echo Usage: "%0 [-h | -help | --help | /h | /help | /?] [ Rebuild | For= ceRebuild ] [Reconfig] [base_tools_path [edk_tools_path]] [VS2019] [VS2017]= [VS2015] [VS2013] [VS2012]" @echo. @echo base_tools_path BaseTools project path, BASE_TOOLS_PATH = will be set to this path. @echo edk_tools_path EDK_TOOLS_PATH will be set to this path. @@ -457,12 +465,14 @@ goto end @echo VS2013 Set the env for VS2013 build. @echo VS2015 Set the env for VS2015 build. @echo VS2017 Set the env for VS2017 build. + @echo VS2019 Set the env for VS2019 build. @echo. =20 :end set REBUILD=3D set FORCE_REBUILD=3D set RECONFIG=3D +set VS2019=3D set VS2017=3D set VS2015=3D set VS2013=3D diff --git a/edksetup.bat b/edksetup.bat index 5f6028deff..024f57a4b7 100755 --- a/edksetup.bat +++ b/edksetup.bat @@ -1,7 +1,7 @@ @REM @file @REM Windows batch file to setup a WORKSPACE environment @REM -@REM Copyright (c) 2006 - 2016, Intel Corporation. All rights reserved.
+@REM Copyright (c) 2006 - 2019, Intel Corporation. All rights reserved.
@REM (C) Copyright 2016 Hewlett Packard Enterprise Development LP
@REM SPDX-License-Identifier: BSD-2-Clause-Patent @REM @@ -133,6 +133,7 @@ if defined CYGWIN_HOME ( :cygwin_done if /I "%1"=3D=3D"Rebuild" shift if /I "%1"=3D=3D"ForceRebuild" shift +if /I "%1"=3D=3D"VS2019" shift if /I "%1"=3D=3D"VS2017" shift if /I "%1"=3D=3D"VS2015" shift if /I "%1"=3D=3D"VS2013" shift @@ -141,7 +142,7 @@ if "%1"=3D=3D"" goto end =20 :Usage @echo. - @echo Usage: "%0 [-h | -help | --help | /h | /help | /?] [Reconfig] [Re= build] [ForceRebuild] [VS2017] [VS2015] [VS2013] [VS2012]" + @echo Usage: "%0 [-h | -help | --help | /h | /help | /?] [Reconfig] [Re= build] [ForceRebuild] [VS2019] [VS2017] [VS2015] [VS2013] [VS2012]" @echo. @echo Reconfig Reinstall target.txt, tools_def.txt and bui= ld_rule.txt. @echo Rebuild Perform incremental rebuild of BaseTools bi= naries. @@ -150,6 +151,7 @@ if "%1"=3D=3D"" goto end @echo VS2013 Set the env for VS2013 build. @echo VS2015 Set the env for VS2015 build. @echo VS2017 Set the env for VS2017 build. + @echo VS2019 Set the env for VS2019 build. @echo. @echo Note that target.template, tools_def.template and build_rules.tem= plate @echo will only be copied to target.txt, tools_def.txt and build_rule.t= xt --=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 (#47108): https://edk2.groups.io/g/devel/message/47108 Mute This Topic: https://groups.io/mt/34100576/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-