From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received-SPF: None (no SPF record) identity=mailfrom; client-ip=2a00:1450:400c:c09::22e; helo=mail-wm0-x22e.google.com; envelope-from=pete@akeo.ie; receiver=edk2-devel@lists.01.org Received: from mail-wm0-x22e.google.com (mail-wm0-x22e.google.com [IPv6:2a00:1450:400c:c09::22e]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id A22EE2035BB1C for ; Fri, 17 Nov 2017 05:04:41 -0800 (PST) Received: by mail-wm0-x22e.google.com with SMTP id 9so6321780wme.4 for ; Fri, 17 Nov 2017 05:08:52 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=akeo-ie.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=QUlzUwpajFhBvyPHnNGmlJGjDJedaUnwisR1HTO3Wcc=; b=mBtWq59SnRp4vvq3aSRHs0PMKjXad5Yn62Z1K8NqVNQ1I4Wheqmm6T/5I95MRXsOMZ f1SFUiiBC69TnEHWMKZOE9kM69XOfETf0Uh+gpAqYCnnHVdvXtUY2eQbSPMuUR8AXjOH mSJ1p2ZwoMbmolCjOpCrF4tOjxWyPJhiUbYTH+yzoa3t/YmLR3iPO1eJxRq4KCcYs0bP iclbWNoX3vEisluPxnod0Lp8jr892W+bsTbCCbkdJVehmTz6542LF+UC0WRjN08anaFk 0ntqef5zXpn+3jN6/JAJhpeY4QH0craGeiSdxY4/eUe+yRCuogv6I6aDAb5Ur3kQyZR4 A4tg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=QUlzUwpajFhBvyPHnNGmlJGjDJedaUnwisR1HTO3Wcc=; b=LKX8Q142D4dlMInfgwO7GMo7GKUou4NIT69z3OlCAfmndnGnO9GmoqrbFZoeIUEI4t kSmlUgKLfpnWDJBe3dOTLdf81IYqyVPCVXGAI6+y7wPcetHNxe7VtTzUt8P9zAFj7vli K9Lz3UHBRW4AmR6DRF7VyPs5WiT9P3CVfvFu2DtbLR68xxcGETJHOd5xLufKj1wb0zQt Qs32XnFcscb15JppHNo2PT80Wzb9mpy5oq69PiKvhPkhL+iUEUmbAdv9EdQ3ghovpkDU RvuXFNQMxiUWX04yYAJmVoitapnG1aYwRvZ/XOohfoRRBC2VK4Pjl6FMWrqvyT+Q7w47 f83A== X-Gm-Message-State: AJaThX7KKX35Ryqn3bSJP9deIWsBeTp+oCckfymMUl4htHopAyJ77xy7 o5/T9VWuAwDaWq6ulWRHzg+7o1bl8jY= X-Google-Smtp-Source: AGs4zMblGsNpG0vq5uiO04j98/ClVCOvRZb1KVW99PA142GIM5fHEOCExCFdop1GKeR1ieZua4QSCQ== X-Received: by 10.80.158.194 with SMTP id a60mr7139707edf.228.1510924130757; Fri, 17 Nov 2017 05:08:50 -0800 (PST) Received: from localhost.localdomain ([84.203.87.46]) by smtp.gmail.com with ESMTPSA id b36sm2883140edd.67.2017.11.17.05.08.49 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 17 Nov 2017 05:08:50 -0800 (PST) From: Pete Batard To: edk2-devel@lists.01.org Cc: liming.gao@intel.com Date: Fri, 17 Nov 2017 13:08:36 +0000 Message-Id: <20171117130837.9164-4-pete@akeo.ie> X-Mailer: git-send-email 2.9.3.windows.2 In-Reply-To: <20171117130837.9164-1-pete@akeo.ie> References: <20171117130837.9164-1-pete@akeo.ie> Subject: [PATCH v2 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: , X-List-Received-Date: Fri, 17 Nov 2017 13:04:42 -0000 From: Liming Gao 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 Signed-off-by: Pete Batard --- BaseTools/get_vsvars.bat | 8 +++++ BaseTools/set_vsprefix_envs.bat | 33 +++++++++++++++++++- 2 files changed, 40 insertions(+), 1 deletion(-) diff --git a/BaseTools/get_vsvars.bat b/BaseTools/get_vsvars.bat index 7649e1dccf47..ba3e54d588cf 100644 --- a/BaseTools/get_vsvars.bat +++ b/BaseTools/get_vsvars.bat @@ -16,6 +16,12 @@ @echo off goto :main +:set_vsvars +for /f "usebackq tokens=1* delims=: " %%i in (`%*`) do ( + if /i "%%i"=="installationPath" call "%%j\VC\Auxiliary\Build\vcvars32.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 beforehand). :main if defined VCINSTALLDIR goto :done + if exist "%ProgramFiles(x86)%\Microsoft Visual Studio\Installer\vswhere.exe" call :set_vsvars "%ProgramFiles(x86)%\Microsoft Visual Studio\Installer\vswhere.exe" + if exist "%ProgramFiles%\Microsoft Visual Studio\Installer\vswhere.exe" call :set_vsvars "%ProgramFiles%\Microsoft Visual Studio\Installer\vswhere.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 b05b1d222083..ed83222a24c8 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 folder @REM if the file is not executed within a WORKSPACE\BaseTools folder. @REM -@REM Copyright (c) 2016, Intel Corporation. All rights reserved.
+@REM Copyright (c) 2016-2017, Intel Corporation. All rights reserved.
@REM @REM This program and the accompanying materials are licensed and made available @REM under the terms and conditions of the BSD License which accompanies this @@ -90,6 +90,37 @@ if defined VS140COMNTOOLS ( ) ) +@REM set VS2017 +if not defined VS150COMNTOOLS ( + if exist "%ProgramFiles(x86)%\Microsoft Visual Studio\Installer\vswhere.exe" ( + for /f "usebackq tokens=1* delims=: " %%i in (`"%ProgramFiles(x86)%\Microsoft Visual Studio\Installer\vswhere.exe"`) do ( + if /i "%%i"=="installationPath" call "%%j\VC\Auxiliary\Build\vcvars32.bat" + ) + ) else if exist "%ProgramFiles%\Microsoft Visual Studio\Installer\vswhere.exe" ( + for /f "usebackq tokens=1* delims=: " %%i in (`"%ProgramFiles%\Microsoft Visual Studio\Installer\vswhere.exe"`) do ( + if /i "%%i"=="installationPath" call "%%j\VC\Auxiliary\Build\vcvars32.bat" + ) + ) else ( + goto SetWinDDK + ) +) + +if defined VCToolsInstallDir ( + if not defined VS2017_PREFIX ( + set "VS2017_PREFIX=%VCToolsInstallDir%" + ) +) +if not defined WINSDK10_PREFIX ( + if defined WindowsSdkVerBinPath ( + set "WINSDK10_PREFIX=%WindowsSdkVerBinPath%" + ) else if exist "%ProgramFiles(x86)%\Windows Kits\10\bin" ( + set "WINSDK10_PREFIX=%ProgramFiles(x86)%\Windows Kits\10\bin\" + ) else if exist "%ProgramFiles%\Windows Kits\10\bin" ( + set "WINSDK10_PREFIX=%ProgramFiles%\Windows Kits\10\bin\" + ) +) + +:SetWinDDK if not defined WINDDK3790_PREFIX ( set WINDDK3790_PREFIX=C:\WINDDK\3790.1830\bin\ ) -- 2.9.3.windows.2