From nobody Thu May 2 16:42:31 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; spf=none (zoho.com: 198.145.21.10 is neither permitted nor denied by domain of lists.01.org) smtp.mailfrom=edk2-devel-bounces@lists.01.org Return-Path: Received: from ml01.01.org (ml01.01.org [198.145.21.10]) by mx.zohomail.com with SMTPS id 1508324637378424.0302526330645; Wed, 18 Oct 2017 04:03:57 -0700 (PDT) Received: from [127.0.0.1] (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id CE3C421CE740D; Wed, 18 Oct 2017 04:00:18 -0700 (PDT) Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id 6AFF12095B06C for ; Wed, 18 Oct 2017 04:00:17 -0700 (PDT) Received: from orsmga005.jf.intel.com ([10.7.209.41]) by fmsmga105.fm.intel.com with ESMTP; 18 Oct 2017 04:03:54 -0700 Received: from shwde7172.ccr.corp.intel.com ([10.239.9.14]) by orsmga005.jf.intel.com with ESMTP; 18 Oct 2017 04:03:53 -0700 X-Original-To: edk2-devel@lists.01.org Received-SPF: none (zoho.com: 198.145.21.10 is neither permitted nor denied by domain of lists.01.org) client-ip=198.145.21.10; envelope-from=edk2-devel-bounces@lists.01.org; helo=ml01.01.org; Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=192.55.52.43; helo=mga05.intel.com; envelope-from=liming.gao@intel.com; receiver=edk2-devel@lists.01.org X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.43,396,1503385200"; d="scan'208";a="161838317" From: Liming Gao To: edk2-devel@lists.01.org Date: Wed, 18 Oct 2017 18:48:52 +0800 Message-Id: <1508323735-14344-2-git-send-email-liming.gao@intel.com> X-Mailer: git-send-email 2.8.0.windows.1 In-Reply-To: <1508323735-14344-1-git-send-email-liming.gao@intel.com> References: <1508323735-14344-1-git-send-email-liming.gao@intel.com> Subject: [edk2] [Patch 1/4] MdePkg: Disable VS warning 4701 & 4703 for VS2017 X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Errors-To: edk2-devel-bounces@lists.01.org Sender: "edk2-devel" X-ZohoMail: RSF_4 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Liming Gao --- MdePkg/Include/Ia32/ProcessorBind.h | 4 ++-- MdePkg/Include/X64/ProcessorBind.h | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/MdePkg/Include/Ia32/ProcessorBind.h b/MdePkg/Include/Ia32/Proc= essorBind.h index 8ba2348..aeecf3f 100644 --- a/MdePkg/Include/Ia32/ProcessorBind.h +++ b/MdePkg/Include/Ia32/ProcessorBind.h @@ -1,7 +1,7 @@ /** @file Processor or Compiler specific defines and types for IA-32 architecture. =20 -Copyright (c) 2006 - 2015, Intel Corporation. All rights reserved.
+Copyright (c) 2006 - 2017, Intel Corporation. All rights reserved.
This program and the accompanying materials are licensed and made availabl= e under=20 the terms and conditions of the BSD License that accompanies this distribu= tion. =20 The full text of the license may be found at @@ -93,7 +93,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER= EXPRESS OR IMPLIED. // #pragma warning ( disable : 4206 ) =20 -#if _MSC_VER =3D=3D 1800 || _MSC_VER =3D=3D 1900 +#if _MSC_VER =3D=3D 1800 || _MSC_VER =3D=3D 1900 || _MSC_VER >=3D 1910 =20 // // Disable these warnings for VS2013. diff --git a/MdePkg/Include/X64/ProcessorBind.h b/MdePkg/Include/X64/Proces= sorBind.h index 72cc851..e637d86 100644 --- a/MdePkg/Include/X64/ProcessorBind.h +++ b/MdePkg/Include/X64/ProcessorBind.h @@ -1,7 +1,7 @@ /** @file Processor or Compiler specific defines and types x64 (Intel 64, AMD64). =20 - Copyright (c) 2006 - 2015, Intel Corporation. All rights reserved.
+ Copyright (c) 2006 - 2017, Intel Corporation. All rights reserved.
This program and the accompanying materials =20 are licensed and made available under the terms and conditions of the BS= D License =20 which accompanies this distribution. The full text of the license may b= e found at =20 @@ -107,7 +107,7 @@ // #pragma warning ( disable : 4206 ) =20 -#if _MSC_VER =3D=3D 1800 || _MSC_VER =3D=3D 1900 +#if _MSC_VER =3D=3D 1800 || _MSC_VER =3D=3D 1900 || _MSC_VER >=3D 1910 =20 // // Disable these warnings for VS2013. --=20 2.8.0.windows.1 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel From nobody Thu May 2 16:42:31 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; spf=none (zoho.com: 198.145.21.10 is neither permitted nor denied by domain of lists.01.org) smtp.mailfrom=edk2-devel-bounces@lists.01.org Return-Path: Received: from ml01.01.org (ml01.01.org [198.145.21.10]) by mx.zohomail.com with SMTPS id 1508324641286313.6051078101857; Wed, 18 Oct 2017 04:04:01 -0700 (PDT) Received: from [127.0.0.1] (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id 1B96621CE7411; Wed, 18 Oct 2017 04:00:22 -0700 (PDT) Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id 5F7422095B06F for ; Wed, 18 Oct 2017 04:00:18 -0700 (PDT) Received: from orsmga005.jf.intel.com ([10.7.209.41]) by fmsmga105.fm.intel.com with ESMTP; 18 Oct 2017 04:03:55 -0700 Received: from shwde7172.ccr.corp.intel.com ([10.239.9.14]) by orsmga005.jf.intel.com with ESMTP; 18 Oct 2017 04:03:54 -0700 X-Original-To: edk2-devel@lists.01.org Received-SPF: none (zoho.com: 198.145.21.10 is neither permitted nor denied by domain of lists.01.org) client-ip=198.145.21.10; envelope-from=edk2-devel-bounces@lists.01.org; helo=ml01.01.org; Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=192.55.52.43; helo=mga05.intel.com; envelope-from=liming.gao@intel.com; receiver=edk2-devel@lists.01.org X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.43,396,1503385200"; d="scan'208";a="161838321" From: Liming Gao To: edk2-devel@lists.01.org Date: Wed, 18 Oct 2017 18:48:53 +0800 Message-Id: <1508323735-14344-3-git-send-email-liming.gao@intel.com> X-Mailer: git-send-email 2.8.0.windows.1 In-Reply-To: <1508323735-14344-1-git-send-email-liming.gao@intel.com> References: <1508323735-14344-1-git-send-email-liming.gao@intel.com> Subject: [edk2] [Patch 2/4] BaseTools: Add VS2017 tool chain in BaseTools tools_def.template X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Errors-To: edk2-devel-bounces@lists.01.org Sender: "edk2-devel" X-ZohoMail: RSF_4 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" VS2017 tool chain enables /WHOLEARCHIVE linker option Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Liming Gao --- BaseTools/Conf/tools_def.template | 122 ++++++++++++++++++++++++++++++++++= ++++ 1 file changed, 122 insertions(+) diff --git a/BaseTools/Conf/tools_def.template b/BaseTools/Conf/tools_def.t= emplate index e93c2a0..b8889f7 100755 --- a/BaseTools/Conf/tools_def.template +++ b/BaseTools/Conf/tools_def.template @@ -74,6 +74,10 @@ DEFINE VS2015x86_BIN =3D ENV(VS2015_PREFIX)Vc\bin DEFINE VS2015x86_DLL =3D ENV(VS2015_PREFIX)Common7\IDE;DEF(VS2015x86_BI= N) DEFINE VS2015x86_BINX64 =3D DEF(VS2015x86_BIN)\x86_amd64 =20 +DEFINE VS2017_BIN =3D ENV(VS2017_PREFIX) +DEFINE VS2017_DLL =3D ENV(VS2017_PREFIX) +DEFINE VS2017_BINX64 =3D ENV(VS2017X64_PREFIX) + DEFINE WINSDK_BIN =3D ENV(WINSDK_PREFIX) DEFINE WINSDKx86_BIN =3D ENV(WINSDKx86_PREFIX) =20 @@ -93,6 +97,9 @@ DEFINE WINSDK8x86_BIN =3D ENV(WINSDK8x86_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) + # These defines are needed for certain Microsoft Visual Studio tools that # are used by other toolchains. An example is that ICC on Windows normally # uses Microsoft's nmake.exe. @@ -4062,6 +4069,121 @@ NOOPT_VS2015x86xASL_X64_DLINK_FLAGS =3D /NOLOGO = /NODEFAULTLIB /IGNORE:4001 /OPT =20 =20 ##########################################################################= ########## +# VS2017 - Microsoft Visual Studio 2017 with Intel ASL +# ASL - Intel ACPI Source Language Compiler (iasl.exe) +##########################################################################= ########## +# VS2017 - Microsoft Visual Studio 2017 professional Edition w= ith Intel ASL +*_VS2017_*_*_FAMILY =3D MSFT + +*_VS2017_*_MAKE_PATH =3D DEF(VS2017_BIN)\nmake.exe +*_VS2017_*_MAKE_FLAG =3D /nologo +*_VS2017_*_RC_PATH =3D DEF(WINSDK10_BIN)\rc.exe + +*_VS2017_*_MAKE_FLAGS =3D /nologo +*_VS2017_*_SLINK_FLAGS =3D /NOLOGO /LTCG +*_VS2017_*_APP_FLAGS =3D /nologo /E /TC +*_VS2017_*_PP_FLAGS =3D /nologo /E /TC /FIAutoGen.h +*_VS2017_*_VFRPP_FLAGS =3D /nologo /E /TC /DVFRCOMPILE /FI$(MODULE_NAM= E)StrDefs.h +*_VS2017_*_DLINK2_FLAGS =3D /WHOLEARCHIVE +*_VS2017_*_ASM16_PATH =3D DEF(VS2017_BIN)\ml.exe + +################## +# ASL definitions +################## +*_VS2017_*_ASL_PATH =3D DEF(WIN_IASL_BIN) +*_VS2017_*_ASL_FLAGS =3D DEF(DEFAULT_WIN_ASL_FLAGS) +*_VS2017_*_ASL_OUTFLAGS =3D DEF(DEFAULT_WIN_ASL_OUTFLAGS) +*_VS2017_*_ASLCC_FLAGS =3D DEF(MSFT_ASLCC_FLAGS) +*_VS2017_*_ASLPP_FLAGS =3D DEF(MSFT_ASLPP_FLAGS) +*_VS2017_*_ASLDLINK_FLAGS =3D DEF(MSFT_ASLDLINK_FLAGS) + +################## +# IA32 definitions +################## +*_VS2017_IA32_*_DLL =3D DEF(VS2017_DLL) + +*_VS2017_IA32_MAKE_PATH =3D DEF(VS2017_BIN)\nmake.exe +*_VS2017_IA32_CC_PATH =3D DEF(VS2017_BIN)\cl.exe +*_VS2017_IA32_VFRPP_PATH =3D DEF(VS2017_BIN)\cl.exe +*_VS2017_IA32_ASLCC_PATH =3D DEF(VS2017_BIN)\cl.exe +*_VS2017_IA32_ASLPP_PATH =3D DEF(VS2017_BIN)\cl.exe +*_VS2017_IA32_SLINK_PATH =3D DEF(VS2017_BIN)\lib.exe +*_VS2017_IA32_DLINK_PATH =3D DEF(VS2017_BIN)\link.exe +*_VS2017_IA32_ASLDLINK_PATH=3D DEF(VS2017_BIN)\link.exe +*_VS2017_IA32_APP_PATH =3D DEF(VS2017_BIN)\cl.exe +*_VS2017_IA32_PP_PATH =3D DEF(VS2017_BIN)\cl.exe +*_VS2017_IA32_ASM_PATH =3D DEF(VS2017_BIN)\ml.exe + + *_VS2017_IA32_MAKE_FLAGS =3D /nologo + DEBUG_VS2017_IA32_CC_FLAGS =3D /nologo /arch:IA32 /c /WX /GS- /W4 /Gs= 32768 /D UNICODE /O1b2 /GL /FIAutoGen.h /EHs-c- /GR- /GF /Gy /Zi /Gm +RELEASE_VS2017_IA32_CC_FLAGS =3D /nologo /arch:IA32 /c /WX /GS- /W4 /Gs= 32768 /D UNICODE /O1b2 /GL /FIAutoGen.h /EHs-c- /GR- /GF +NOOPT_VS2017_IA32_CC_FLAGS =3D /nologo /arch:IA32 /c /WX /GS- /W4 /Gs= 32768 /D UNICODE /FIAutoGen.h /EHs-c- /GR- /GF /Gy /Zi /Gm /Od + + DEBUG_VS2017_IA32_ASM_FLAGS =3D /nologo /c /WX /W3 /Cx /coff /Zd /Zi +RELEASE_VS2017_IA32_ASM_FLAGS =3D /nologo /c /WX /W3 /Cx /coff /Zd +NOOPT_VS2017_IA32_ASM_FLAGS =3D /nologo /c /WX /W3 /Cx /coff /Zd /Zi + + DEBUG_VS2017_IA32_NASM_FLAGS =3D -Ox -f win32 -g +RELEASE_VS2017_IA32_NASM_FLAGS =3D -Ox -f win32 +NOOPT_VS2017_IA32_NASM_FLAGS =3D -O0 -f win32 -g + + DEBUG_VS2017_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_VS2017_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_VS2017_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 +################## +*_VS2017_X64_*_DLL =3D DEF(VS2017_DLL) + +*_VS2017_X64_CC_PATH =3D DEF(VS2017_BINX64)\cl.exe +*_VS2017_X64_PP_PATH =3D DEF(VS2017_BINX64)\cl.exe +*_VS2017_X64_APP_PATH =3D DEF(VS2017_BINX64)\cl.exe +*_VS2017_X64_VFRPP_PATH =3D DEF(VS2017_BINX64)\cl.exe +*_VS2017_X64_ASLCC_PATH =3D DEF(VS2017_BINX64)\cl.exe +*_VS2017_X64_ASLPP_PATH =3D DEF(VS2017_BINX64)\cl.exe +*_VS2017_X64_ASM_PATH =3D DEF(VS2017_BINX64)\ml64.exe +*_VS2017_X64_SLINK_PATH =3D DEF(VS2017_BINX64)\lib.exe +*_VS2017_X64_DLINK_PATH =3D DEF(VS2017_BINX64)\link.exe +*_VS2017_X64_ASLDLINK_PATH =3D DEF(VS2017_BINX64)\link.exe + + DEBUG_VS2017_X64_CC_FLAGS =3D /nologo /c /WX /GS- /W4 /Gs32768 /D UN= ICODE /O1b2s /GL /Gy /FIAutoGen.h /EHs-c- /GR- /GF /Zi /Gm +RELEASE_VS2017_X64_CC_FLAGS =3D /nologo /c /WX /GS- /W4 /Gs32768 /D UN= ICODE /O1b2s /GL /Gy /FIAutoGen.h /EHs-c- /GR- /GF +NOOPT_VS2017_X64_CC_FLAGS =3D /nologo /c /WX /GS- /W4 /Gs32768 /D UN= ICODE /Gy /FIAutoGen.h /EHs-c- /GR- /GF /Zi /Gm /Od + + DEBUG_VS2017_X64_ASM_FLAGS =3D /nologo /c /WX /W3 /Cx /Zd /Zi +RELEASE_VS2017_X64_ASM_FLAGS =3D /nologo /c /WX /W3 /Cx /Zd +NOOPT_VS2017_X64_ASM_FLAGS =3D /nologo /c /WX /W3 /Cx /Zd /Zi + + DEBUG_VS2017_X64_NASM_FLAGS =3D -Ox -f win64 -g +RELEASE_VS2017_X64_NASM_FLAGS =3D -Ox -f win64 +NOOPT_VS2017_X64_NASM_FLAGS =3D -O0 -f win64 -g + + DEBUG_VS2017_X64_DLINK_FLAGS =3D /NOLOGO /NODEFAULTLIB /IGNORE:4001 /OP= T:REF /OPT:ICF=3D10 /MAP /ALIGN:32 /SECTION:.xdata,D /SECTION:.pdata,D /Mac= hine:X64 /LTCG /DLL /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:EFI_BOOT_SERVICE= _DRIVER /SAFESEH:NO /BASE:0 /DRIVER /DEBUG +RELEASE_VS2017_X64_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:X64 /LTCG /DLL /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:EFI= _BOOT_SERVICE_DRIVER /SAFESEH:NO /BASE:0 /DRIVER /MERGE:.rdata=3D.data +NOOPT_VS2017_X64_DLINK_FLAGS =3D /NOLOGO /NODEFAULTLIB /IGNORE:4001 /OP= T:REF /OPT:ICF=3D10 /MAP /ALIGN:32 /SECTION:.xdata,D /SECTION:.pdata,D /Mac= hine:X64 /LTCG /DLL /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:EFI_BOOT_SERVICE= _DRIVER /SAFESEH:NO /BASE:0 /DRIVER /DEBUG + +################## +# EBC definitions +################## +*_VS2017_EBC_*_FAMILY =3D INTEL +*_VS2017_EBC_*_DLL =3D DEF(VS2017_DLL) + +*_VS2017_EBC_MAKE_PATH =3D DEF(VS2017_BIN)\nmake.exe +*_VS2017_EBC_PP_PATH =3D DEF(EBC_BINx86)\iec.exe +*_VS2017_EBC_VFRPP_PATH =3D DEF(EBC_BINx86)\iec.exe +*_VS2017_EBC_CC_PATH =3D DEF(EBC_BINx86)\iec.exe +*_VS2017_EBC_SLINK_PATH =3D DEF(VS2017_BIN)\link.exe +*_VS2017_EBC_DLINK_PATH =3D DEF(VS2017_BIN)\link.exe + +*_VS2017_EBC_MAKE_FLAGS =3D /nologo +*_VS2017_EBC_PP_FLAGS =3D /nologo /E /TC /FIAutoGen.h +*_VS2017_EBC_CC_FLAGS =3D /nologo /c /WX /W3 /FIAutoGen.h /D$(M= ODULE_ENTRY_POINT)=3D$(ARCH_ENTRY_POINT) +*_VS2017_EBC_VFRPP_FLAGS =3D /nologo /E /TC /DVFRCOMPILE /FI$(MODU= LE_NAME)StrDefs.h +*_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 + +##########################################################################= ########## # # Microsoft Device Driver Kit 3790.1830 (IA-32, X64, Itanium, with Link Ti= me Code Generation) # And Intel ACPI Compiler --=20 2.8.0.windows.1 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel From nobody Thu May 2 16:42:31 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; spf=none (zoho.com: 198.145.21.10 is neither permitted nor denied by domain of lists.01.org) smtp.mailfrom=edk2-devel-bounces@lists.01.org Return-Path: Received: from ml01.01.org (ml01.01.org [198.145.21.10]) by mx.zohomail.com with SMTPS id 1508324643375613.1601065747262; Wed, 18 Oct 2017 04:04:03 -0700 (PDT) Received: from [127.0.0.1] (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id 52B7821CF58CA; Wed, 18 Oct 2017 04:00:22 -0700 (PDT) Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id 335CB21CE740C for ; Wed, 18 Oct 2017 04:00:19 -0700 (PDT) Received: from orsmga005.jf.intel.com ([10.7.209.41]) by fmsmga105.fm.intel.com with ESMTP; 18 Oct 2017 04:03:56 -0700 Received: from shwde7172.ccr.corp.intel.com ([10.239.9.14]) by orsmga005.jf.intel.com with ESMTP; 18 Oct 2017 04:03:55 -0700 X-Original-To: edk2-devel@lists.01.org Received-SPF: none (zoho.com: 198.145.21.10 is neither permitted nor denied by domain of lists.01.org) client-ip=198.145.21.10; envelope-from=edk2-devel-bounces@lists.01.org; helo=ml01.01.org; Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=192.55.52.43; helo=mga05.intel.com; envelope-from=liming.gao@intel.com; receiver=edk2-devel@lists.01.org X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.43,396,1503385200"; d="scan'208";a="161838326" From: Liming Gao To: edk2-devel@lists.01.org Date: Wed, 18 Oct 2017 18:48:54 +0800 Message-Id: <1508323735-14344-4-git-send-email-liming.gao@intel.com> X-Mailer: git-send-email 2.8.0.windows.1 In-Reply-To: <1508323735-14344-1-git-send-email-liming.gao@intel.com> References: <1508323735-14344-1-git-send-email-liming.gao@intel.com> Subject: [edk2] [Patch 3/4] BaseTools: Update VS batch file to auto detect VS2017 X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Errors-To: edk2-devel-bounces@lists.01.org Sender: "edk2-devel" X-ZohoMail: RSF_4 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" This way depends on VS vswhere.exe to find VS2017 installed directory. vswhere.exe starts in Visual Studio 2017 version 15.2. Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Liming Gao --- BaseTools/get_vsvars.bat | 8 ++++++++ BaseTools/set_vsprefix_envs.bat | 30 ++++++++++++++++++++++++++++++ 2 files changed, 38 insertions(+) diff --git a/BaseTools/get_vsvars.bat b/BaseTools/get_vsvars.bat index 7649e1d..ba3e54d 100644 --- a/BaseTools/get_vsvars.bat +++ b/BaseTools/get_vsvars.bat @@ -16,6 +16,12 @@ @echo off goto :main =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" +) +goto :EOF + :read_vsvars @rem Do nothing if already found, otherwise call vsvars32.bat if there if defined VCINSTALLDIR goto :EOF @@ -33,6 +39,8 @@ REM (Or invoke the relevant vsvars32 file beforehan= d). =20 :main if defined VCINSTALLDIR goto :done + if exist "%ProgramFiles(x86)%\Microsoft Visual Studio\Installer\vswhere.= exe" call :set_vsvars "%ProgramFiles(x86)%\Microsoft Visual Studio\Install= er\vswhere.exe" + if exist "%ProgramFiles%\Microsoft Visual Studio\Installer\vswhere.exe" = call :set_vsvars "%ProgramFiles%\Microsoft Visual Studio\Installer\vs= where.exe" if defined VS140COMNTOOLS call :read_vsvars "%VS140COMNTOOLS%" if defined VS120COMNTOOLS call :read_vsvars "%VS120COMNTOOLS%" if defined VS110COMNTOOLS call :read_vsvars "%VS110COMNTOOLS%" diff --git a/BaseTools/set_vsprefix_envs.bat b/BaseTools/set_vsprefix_envs.= bat index b05b1d2..dbd4e98 100644 --- a/BaseTools/set_vsprefix_envs.bat +++ b/BaseTools/set_vsprefix_envs.bat @@ -90,6 +90,36 @@ if defined VS140COMNTOOLS ( ) ) =20 +@REM set VS2017 +if not defined VS150COMNTOOLS ( + if exist "%ProgramFiles(x86)%\Microsoft Visual Studio\Installer\vswhere.= exe" ( + for /f "usebackq tokens=3D1* delims=3D: " %%i in (`"%ProgramFiles(x86)= %\Microsoft Visual Studio\Installer\vswhere.exe"`) do ( + if /i "%%i"=3D=3D"installationPath" call "%%j\VC\Auxiliary\Build\vcv= ars32.bat" + ) + ) else if exist "%ProgramFiles%\Microsoft Visual Studio\Installer\vswher= e.exe" ( + for /f "usebackq tokens=3D1* delims=3D: " %%i in (`"%ProgramFiles%\Mic= rosoft Visual Studio\Installer\vswhere.exe"`) do ( + if /i "%%i"=3D=3D"installationPath" call "%%j\VC\Auxiliary\Build\vcv= ars32.bat" + ) + ) else ( + goto SetWinDDK + ) +) + +if defined VCToolsInstallDir ( + if not defined VS2017_PREFIX ( + set "VS2017_PREFIX=3D%VCToolsInstallDir%bin\HostX86\x86" + set "VS2017X64_PREFIX=3D%VCToolsInstallDir%bin\HostX86\x64" + ) +) +if not defined WINSDK10_PREFIX ( + if exist "%ProgramFiles(x86)%\Windows Kits\10\bin\x86" ( + set "WINSDK10_PREFIX=3D%ProgramFiles(x86)%\Windows Kits\10\bin\x86" + ) else if exist "%ProgramFiles%\Windows Kits\10\bin\x86" ( + set "WINSDK10_PREFIX=3D%ProgramFiles%\Windows Kits\10\bin\x86" + ) +) + +:SetWinDDK if not defined WINDDK3790_PREFIX ( set WINDDK3790_PREFIX=3DC:\WINDDK\3790.1830\bin\ ) --=20 2.8.0.windows.1 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel From nobody Thu May 2 16:42:31 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; spf=none (zoho.com: 198.145.21.10 is neither permitted nor denied by domain of lists.01.org) smtp.mailfrom=edk2-devel-bounces@lists.01.org Return-Path: Received: from ml01.01.org (ml01.01.org [198.145.21.10]) by mx.zohomail.com with SMTPS id 1508324645997694.9398659604468; Wed, 18 Oct 2017 04:04:05 -0700 (PDT) Received: from [127.0.0.1] (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id 8904F21CF58D2; Wed, 18 Oct 2017 04:00:22 -0700 (PDT) Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id 1FB1E21CE740C for ; Wed, 18 Oct 2017 04:00:20 -0700 (PDT) Received: from orsmga005.jf.intel.com ([10.7.209.41]) by fmsmga105.fm.intel.com with ESMTP; 18 Oct 2017 04:03:57 -0700 Received: from shwde7172.ccr.corp.intel.com ([10.239.9.14]) by orsmga005.jf.intel.com with ESMTP; 18 Oct 2017 04:03:56 -0700 X-Original-To: edk2-devel@lists.01.org Received-SPF: none (zoho.com: 198.145.21.10 is neither permitted nor denied by domain of lists.01.org) client-ip=198.145.21.10; envelope-from=edk2-devel-bounces@lists.01.org; helo=ml01.01.org; Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=192.55.52.43; helo=mga05.intel.com; envelope-from=liming.gao@intel.com; receiver=edk2-devel@lists.01.org X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.43,396,1503385200"; d="scan'208";a="161838328" From: Liming Gao To: edk2-devel@lists.01.org Date: Wed, 18 Oct 2017 18:48:55 +0800 Message-Id: <1508323735-14344-5-git-send-email-liming.gao@intel.com> X-Mailer: git-send-email 2.8.0.windows.1 In-Reply-To: <1508323735-14344-1-git-send-email-liming.gao@intel.com> References: <1508323735-14344-1-git-send-email-liming.gao@intel.com> Subject: [edk2] [Patch 4/4] Nt32Pkg: Add VS2017 support in SecMain X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Errors-To: edk2-devel-bounces@lists.01.org Sender: "edk2-devel" X-ZohoMail: RSF_4 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Liming Gao --- Nt32Pkg/Sec/SecMain.inf | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Nt32Pkg/Sec/SecMain.inf b/Nt32Pkg/Sec/SecMain.inf index 423a3c7..48670cf 100644 --- a/Nt32Pkg/Sec/SecMain.inf +++ b/Nt32Pkg/Sec/SecMain.inf @@ -70,6 +70,7 @@ MSFT:*_*_IA32_DLINK_FLAGS =3D=3D /out:"$(BIN_DIR)\SecMain.exe" /base:0x1= 0000000 /pdb:"$(BIN_DIR)\SecMain.pdb" /LIBPATH:"$(VCINSTALLDIR)\Lib" /LIBPA= TH:"$(VCINSTALLDIR)\PlatformSdk\Lib" /LIBPATH:"%UniversalCRTSdkDir%lib\%UCR= TVersion%\ucrt\x86" /LIBPATH:"%WindowsSdkDir%lib\%WindowsSDKLibVersion%\um\= x86" /NOLOGO /SUBSYSTEM:CONSOLE /NODEFAULTLIB /IGNORE:4086 /MAP /OPT:REF /D= EBUG /MACHINE:I386 /LTCG Kernel32.lib MSVCRTD.lib Gdi32.lib User32.lib Winm= m.lib Advapi32.lib MSFT:*_VS2015_IA32_DLINK_FLAGS =3D=3D /out:"$(BIN_DIR)\SecMain.exe" /bas= e:0x10000000 /pdb:"$(BIN_DIR)\SecMain.pdb" /LIBPATH:"$(VCINSTALLDIR)\Lib" /= LIBPATH:"$(VCINSTALLDIR)\PlatformSdk\Lib" /LIBPATH:"%UniversalCRTSdkDir%lib= \%UCRTVersion%\ucrt\x86" /LIBPATH:"%WindowsSdkDir%lib\%WindowsSDKLibVersion= %\um\x86" /NOLOGO /SUBSYSTEM:CONSOLE /NODEFAULTLIB /IGNORE:4086 /MAP /OPT:R= EF /DEBUG /MACHINE:I386 /LTCG Kernel32.lib MSVCRTD.lib vcruntimed.lib ucrtd= .lib Gdi32.lib User32.lib Winmm.lib Advapi32.lib MSFT:*_VS2015x86_IA32_DLINK_FLAGS =3D=3D /out:"$(BIN_DIR)\SecMain.exe" /= base:0x10000000 /pdb:"$(BIN_DIR)\SecMain.pdb" /LIBPATH:"$(VCINSTALLDIR)\Lib= " /LIBPATH:"$(VCINSTALLDIR)\PlatformSdk\Lib" /LIBPATH:"%UniversalCRTSdkDir%= lib\%UCRTVersion%\ucrt\x86" /LIBPATH:"%WindowsSdkDir%lib\%WindowsSDKLibVers= ion%\um\x86" /NOLOGO /SUBSYSTEM:CONSOLE /NODEFAULTLIB /IGNORE:4086 /MAP /OP= T:REF /DEBUG /MACHINE:I386 /LTCG Kernel32.lib MSVCRTD.lib vcruntimed.lib uc= rtd.lib Gdi32.lib User32.lib Winmm.lib Advapi32.lib + MSFT:*_VS2017_IA32_DLINK_FLAGS =3D=3D /out:"$(BIN_DIR)\SecMain.exe" /bas= e:0x10000000 /pdb:"$(BIN_DIR)\SecMain.pdb" /LIBPATH:"%VCToolsInstallDir%lib= \x86" /LIBPATH:"%UniversalCRTSdkDir%lib\%UCRTVersion%\ucrt\x86" /LIBPATH:"%= WindowsSdkDir%lib\%WindowsSDKLibVersion%\um\x86" /NOLOGO /SUBSYSTEM:CONSOLE= /NODEFAULTLIB /IGNORE:4086 /MAP /OPT:REF /DEBUG /MACHINE:I386 /LTCG Kernel= 32.lib MSVCRTD.lib vcruntimed.lib ucrtd.lib Gdi32.lib User32.lib Winmm.lib = Advapi32.lib MSFT:*_*_IA32_CC_FLAGS =3D=3D /nologo /W4 /WX /Gy /c /D UNICODE /Od /FIA= utoGen.h /EHs-c- /GF /Gs8192 /Zi /Gm /D _CRT_SECURE_NO_WARNINGS /D _CRT_SEC= URE_NO_DEPRECATE MSFT:*_*_IA32_PP_FLAGS =3D=3D /nologo /E /TC /FIAutoGen.h MSFT:*_*_IA32_ASM_FLAGS =3D=3D /nologo /W3 /WX /c /coff /Cx /Zd /W0 /Zi @@ -78,6 +79,7 @@ MSFT:*_*_X64_DLINK_FLAGS =3D=3D /out:"$(BIN_DIR)\SecMain.exe" /base:0x10= 000000 /pdb:"$(BIN_DIR)\SecMain.pdb" /LIBPATH:"$(VCINSTALLDIR)\Lib\AMD64" /= LIBPATH:"%UniversalCRTSdkDir%lib\%UCRTVersion%\ucrt\x64" /LIBPATH:"%Windows= SdkDir%lib\%WindowsSDKLibVersion%\um\x64" /NOLOGO /SUBSYSTEM:CONSOLE /NODEF= AULTLIB /IGNORE:4086 /MAP /OPT:REF /DEBUG /MACHINE:AMD64 /LTCG Kernel32.lib= MSVCRTD.lib Gdi32.lib User32.lib Winmm.lib Advapi32.lib MSFT:*_VS2015_X64_DLINK_FLAGS =3D=3D /out:"$(BIN_DIR)\SecMain.exe" /base= :0x10000000 /pdb:"$(BIN_DIR)\SecMain.pdb" /LIBPATH:"$(VCINSTALLDIR)\Lib\AMD= 64" /LIBPATH:"%UniversalCRTSdkDir%lib\%UCRTVersion%\ucrt\x64" /LIBPATH:"%Wi= ndowsSdkDir%lib\%WindowsSDKLibVersion%\um\x64" /NOLOGO /SUBSYSTEM:CONSOLE /= NODEFAULTLIB /IGNORE:4086 /MAP /OPT:REF /DEBUG /MACHINE:AMD64 /LTCG Kernel3= 2.lib MSVCRTD.lib vcruntimed.lib ucrtd.lib Gdi32.lib User32.lib Winmm.lib A= dvapi32.lib MSFT:*_VS2015x86_X64_DLINK_FLAGS =3D=3D /out:"$(BIN_DIR)\SecMain.exe" /b= ase:0x10000000 /pdb:"$(BIN_DIR)\SecMain.pdb" /LIBPATH:"$(VCINSTALLDIR)\Lib\= AMD64" /LIBPATH:"%UniversalCRTSdkDir%lib\%UCRTVersion%\ucrt\x64" /LIBPATH:"= %WindowsSdkDir%lib\%WindowsSDKLibVersion%\um\x64" /NOLOGO /SUBSYSTEM:CONSOL= E /NODEFAULTLIB /IGNORE:4086 /MAP /OPT:REF /DEBUG /MACHINE:AMD64 /LTCG Kern= el32.lib MSVCRTD.lib vcruntimed.lib ucrtd.lib Gdi32.lib User32.lib Winmm.li= b Advapi32.lib + MSFT:*_VS2017_X64_DLINK_FLAGS =3D=3D /out:"$(BIN_DIR)\SecMain.exe" /base= :0x10000000 /pdb:"$(BIN_DIR)\SecMain.pdb" /LIBPATH:"%VCToolsInstallDir%lib\= x64" /LIBPATH:"%UniversalCRTSdkDir%lib\%UCRTVersion%\ucrt\x64" /LIBPATH:"%W= indowsSdkDir%lib\%WindowsSDKLibVersion%\um\x64" /NOLOGO /SUBSYSTEM:CONSOLE = /NODEFAULTLIB /IGNORE:4086 /MAP /OPT:REF /DEBUG /MACHINE:AMD64 /LTCG Kernel= 32.lib MSVCRTD.lib vcruntimed.lib ucrtd.lib Gdi32.lib User32.lib Winmm.lib = Advapi32.lib MSFT:*_*_X64_CC_FLAGS =3D=3D /nologo /W4 /WX /Gy /c /D UNICODE /Od /FIAu= toGen.h /EHs-c- /GF /Gs8192 /Zi /Gm /D _CRT_SECURE_NO_WARNINGS /D _CRT_SECU= RE_NO_DEPRECATE MSFT:*_*_X64_PP_FLAGS =3D=3D /nologo /E /TC /FIAutoGen.h MSFT:*_*_X64_ASM_FLAGS =3D=3D /nologo /W3 /WX /c /Cx /Zd /W0 /Zi --=20 2.8.0.windows.1 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel