From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: mx.groups.io; dkim=missing; spf=pass (domain: intel.com, ip: 192.55.52.136, mailfrom: liming.gao@intel.com) Received: from mga12.intel.com (mga12.intel.com [192.55.52.136]) by groups.io with SMTP; Thu, 19 Sep 2019 01:23:42 -0700 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga006.jf.intel.com ([10.7.209.51]) by fmsmga106.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 19 Sep 2019 01:23:41 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.64,522,1559545200"; d="scan'208";a="191982036" Received: from fmsmsx107.amr.corp.intel.com ([10.18.124.205]) by orsmga006.jf.intel.com with ESMTP; 19 Sep 2019 01:23:41 -0700 Received: from FMSMSX109.amr.corp.intel.com (10.18.116.9) by fmsmsx107.amr.corp.intel.com (10.18.124.205) with Microsoft SMTP Server (TLS) id 14.3.439.0; Thu, 19 Sep 2019 01:23:40 -0700 Received: from shsmsx108.ccr.corp.intel.com (10.239.4.97) by fmsmsx109.amr.corp.intel.com (10.18.116.9) with Microsoft SMTP Server (TLS) id 14.3.439.0; Thu, 19 Sep 2019 01:23:40 -0700 Received: from shsmsx104.ccr.corp.intel.com ([169.254.5.32]) by SHSMSX108.ccr.corp.intel.com ([169.254.8.146]) with mapi id 14.03.0439.000; Thu, 19 Sep 2019 16:23:38 +0800 From: "Liming Gao" To: "Cheng, Ching JenX" , "devel@edk2.groups.io" CC: "Chan, Amy" , "Feng, Bob C" Subject: Re: [PATCH v2 2/2] Add VS2019 Support on ToolSetup Batches Thread-Topic: [PATCH v2 2/2] Add VS2019 Support on ToolSetup Batches Thread-Index: AQHVbQZ5IEKdFw1PbkuHQ4mvoPzB/qcyq6gA Date: Thu, 19 Sep 2019 08:23:37 +0000 Message-ID: <4A89E2EF3DFEDB4C8BFDE51014F606A14E4FE77E@SHSMSX104.ccr.corp.intel.com> References: <20190917031627.4304-1-ching.jenx.cheng@intel.com> <20190917031627.4304-3-ching.jenx.cheng@intel.com> In-Reply-To: <20190917031627.4304-3-ching.jenx.cheng@intel.com> Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [10.239.127.40] MIME-Version: 1.0 Return-Path: liming.gao@intel.com Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Allen: In my machine, I install VS2017, but not install VS2019. I call edksetup.= bat. It will set up VS2017 environment.=20 But with this change, it will set the wrong WINSDK10_PREFIX. I add the co= mments in the patch.=20 >-----Original Message----- >From: Cheng, Ching JenX >Sent: Tuesday, September 17, 2019 11:16 AM >To: devel@edk2.groups.io >Cc: Chan, Amy ; Feng, Bob C ; >Gao, Liming >Subject: [PATCH v2 2/2] Add VS2019 Support on ToolSetup Batches > >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 > >Cc: Amy Chan >Cc: Bob Feng >Cc: Liming Gao >Signed-off-by: Ching JenX Cheng >--- > BaseTools/get_vsvars.bat | 37 ++++++++++++++++++++++++++++++----- >-- > BaseTools/set_vsprefix_envs.bat | 70 >+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ >++++++----- > BaseTools/toolsetup.bat | 16 +++++++++++++--- > edksetup.bat | 6 ++++-- > 4 files changed, 112 insertions(+), 17 deletions(-) > >diff --git a/BaseTools/get_vsvars.bat b/BaseTools/get_vsvars.bat >index 9f3759b2a9..3beb113be2 100644 >--- a/BaseTools/get_vsvars.bat >+++ b/BaseTools/get_vsvars.bat >@@ -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 > > :set_vsvars >-for /f "usebackq tokens=3D1* delims=3D: " %%i in (`%*`) do ( >- if /i "%%i"=3D=3D"installationPath" call "%%j\VC\Auxiliary\Build\vcvars= 32.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 > > :read_vsvars >@@ -42,19 +48,36 @@ REM (Or invoke the relevant vsvars32 file >beforehand). > > :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\Installer\vswhere.exe" -products >Microsoft.VisualStudio.Product.BuildTools -version 16,17 >+ ) else ( >+ call :set_vsvars "%ProgramFiles(x86)%\Microsoft Visual >Studio\Installer\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\vswhere.exe" -products >Microsoft.VisualStudio.Product.BuildTools -version 16,17 >+ ) else ( >+ call :set_vsvars "%ProgramFiles%\Microsoft Visual >Studio\Installer\vswhere.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\Installer\vswhere.exe" -products >Microsoft.VisualStudio.Product.BuildTools >+ call :set_vsvars "%ProgramFiles(x86)%\Microsoft Visual >Studio\Installer\vswhere.exe" -products >Microsoft.VisualStudio.Product.BuildTools -version 15,16 > ) else ( >- call :set_vsvars "%ProgramFiles(x86)%\Microsoft Visual >Studio\Installer\vswhere.exe" >+ call :set_vsvars "%ProgramFiles(x86)%\Microsoft Visual >Studio\Installer\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\vswhere.exe" -products >Microsoft.VisualStudio.Product.BuildTools >+ call :set_vsvars "%ProgramFiles%\Microsoft Visual >Studio\Installer\vswhere.exe" -products >Microsoft.VisualStudio.Product.BuildTools -version 15,16 > ) else ( >- call :set_vsvars "%ProgramFiles%\Microsoft Visual >Studio\Installer\vswhere.exe" >+ call :set_vsvars "%ProgramFiles%\Microsoft Visual >Studio\Installer\vswhere.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 >folder > @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 > > :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 > >+: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 > 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 >+ ) 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\= vcvars32.bat" >+ ) >+ del vswhereInfo >+ ) >+ ) else if exist "%ProgramFiles%\Microsoft Visual >Studio\Installer\vswhere.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 > >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 >+ ) 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\= vcvars32.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\" >+ ) >+) In my machine, VS2019 is not installed. Then, WindowsSdkVerBinPath is not s= et.=20 So, set "WINSDK10_PREFIX=3D%ProgramFiles(x86)%\Windows Kits\10\bin\" But, I install VS2017. WINSDK10_PREFIX should be set later. Here, the suggest change is to move WINSDK10_PREFIX setting into VCToolsIns= tallDir check condition.=20 WINSDK10_PREFIX is only set when VCToolsInstallDir is defined.=20 Thanks Liming >+ > :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(x86)%\Microsoft Visual Studio\Installer\vswhere.exe" - >products Microsoft.VisualStudio.Product.BuildTools`) do ( >+ call "%ProgramFiles(x86)%\Microsoft Visual >Studio\Installer\vswhere.exe" -products >Microsoft.VisualStudio.Product.BuildTools -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\= vcvars32.bat" > ) >+ del vswhereInfo > ) else ( >- for /f "usebackq tokens=3D1* delims=3D: " %%i in >(`"%ProgramFiles(x86)%\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\= vcvars32.bat" > ) >+ del vswhereInfo > ) > ) else if exist "%ProgramFiles%\Microsoft Visual >Studio\Installer\vswhere.exe" ( > if exist "%ProgramFiles%\Microsoft Visual Studio\2017\BuildTools" ( >- for /f "usebackq tokens=3D1* delims=3D: " %%i in >(`"%ProgramFiles%\Microsoft Visual Studio\Installer\vswhere.exe" -products >Microsoft.VisualStudio.Product.BuildTools`) do ( >+ call "%ProgramFiles%\Microsoft Visual Studio\Installer\vswhere.exe"= - >products Microsoft.VisualStudio.Product.BuildTools -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\= vcvars32.bat" > ) >+ del vswhereInfo > ) else ( >- for /f "usebackq tokens=3D1* delims=3D: " %%i in >(`"%ProgramFiles%\Microsoft 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\= vcvars32.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 >folder > @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 > > :Usage > @echo. >- echo Usage: "%0 [-h | -help | --help | /h | /help | /?] [ Rebuild | >ForceRebuild ] [Reconfig] [base_tools_path [edk_tools_path]] [VS2017] >[VS2015] [VS2013] [VS2012]" >+ echo Usage: "%0 [-h | -help | --help | /h | /help | /?] [ Rebuild | >ForceRebuild ] [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. > > :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 > > :Usage > @echo. >- @echo Usage: "%0 [-h | -help | --help | /h | /help | /?] [Reconfig] [R= ebuild] >[ForceRebuild] [VS2017] [VS2015] [VS2013] [VS2012]" >+ @echo Usage: "%0 [-h | -help | --help | /h | /help | /?] [Reconfig] [R= ebuild] >[ForceRebuild] [VS2019] [VS2017] [VS2015] [VS2013] [VS2012]" > @echo. > @echo Reconfig Reinstall target.txt, tools_def.txt and bu= ild_rule.txt. > @echo Rebuild Perform incremental rebuild of BaseTools b= inaries. >@@ -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.template > @echo will only be copied to target.txt, tools_def.txt and build_rule.= txt >-- >2.21.0.windows.1