From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: mx.groups.io; dkim=missing; spf=pass (domain: intel.com, ip: 134.134.136.126, mailfrom: liming.gao@intel.com) Received: from mga18.intel.com (mga18.intel.com [134.134.136.126]) by groups.io with SMTP; Mon, 16 Sep 2019 08:53:48 -0700 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga005.jf.intel.com ([10.7.209.41]) by orsmga106.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 16 Sep 2019 08:53:47 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.64,513,1559545200"; d="scan'208";a="361564340" Received: from fmsmsx108.amr.corp.intel.com ([10.18.124.206]) by orsmga005.jf.intel.com with ESMTP; 16 Sep 2019 08:53:47 -0700 Received: from shsmsx152.ccr.corp.intel.com (10.239.6.52) by FMSMSX108.amr.corp.intel.com (10.18.124.206) with Microsoft SMTP Server (TLS) id 14.3.439.0; Mon, 16 Sep 2019 08:53:47 -0700 Received: from shsmsx104.ccr.corp.intel.com ([169.254.5.32]) by SHSMSX152.ccr.corp.intel.com ([169.254.6.132]) with mapi id 14.03.0439.000; Mon, 16 Sep 2019 23:52:42 +0800 From: "Liming Gao" To: "Cheng, Ching JenX" , "devel@edk2.groups.io" CC: "Chan, Amy" , "Feng, Bob C" Subject: Re: [PATCH 2/2] Add VS2019 Support on ToolSetup Batches Thread-Topic: [PATCH 2/2] Add VS2019 Support on ToolSetup Batches Thread-Index: AQHVaGdoOlKzhVO+/0CwDq1hnZWITKcufFIQ Date: Mon, 16 Sep 2019 15:52:42 +0000 Message-ID: <4A89E2EF3DFEDB4C8BFDE51014F606A14E4F89C2@SHSMSX104.ccr.corp.intel.com> References: <20190911060804.15728-1-ching.jenx.cheng@intel.com> <20190911060804.15728-3-ching.jenx.cheng@intel.com> In-Reply-To: <20190911060804.15728-3-ching.jenx.cheng@intel.com> Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-ctpclassification: CTP_NT x-titus-metadata-40: eyJDYXRlZ29yeUxhYmVscyI6IiIsIk1ldGFkYXRhIjp7Im5zIjoiaHR0cDpcL1wvd3d3LnRpdHVzLmNvbVwvbnNcL0ludGVsMyIsImlkIjoiYzU3ZTVkZTAtYzI1MC00ZmFmLWFmYzktNmJiN2M2NWU5ZDdlIiwicHJvcHMiOlt7Im4iOiJDVFBDbGFzc2lmaWNhdGlvbiIsInZhbHMiOlt7InZhbHVlIjoiQ1RQX05UIn1dfV19LCJTdWJqZWN0TGFiZWxzIjpbXSwiVE1DVmVyc2lvbiI6IjE3LjEwLjE4MDQuNDkiLCJUcnVzdGVkTGFiZWxIYXNoIjoiRkFJaUp0MTViUndSdUljMlZjUklTSW9OUzdXS2ZhenpcL0hVMXdIeFg5OURRWVpMR3dlbW1EK3hhRld2eno3Z2MifQ== dlp-product: dlpe-windows dlp-version: 11.2.0.6 dlp-reaction: no-action 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 Jen:=20 I add my comments. > -----Original Message----- > From: Cheng, Ching JenX > Sent: Wednesday, September 11, 2019 2:08 PM > To: devel@edk2.groups.io > Cc: Chan, Amy ; Feng, Bob C ; G= ao, Liming > Subject: [PATCH 2/2] Add VS2019 Support on ToolSetup Batches >=20 > REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3D2182 >=20 > 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 >=20 > Change-Id: I72d5ef66fd39d3d42b0b2ea57199b4fa27260ab6 Remove Change-Id. > 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(-) >=20 > 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. Don't update ARM Copyright. Thanks Liming >=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\vcvar= s32.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 befor= ehand). >=20 > :main > if defined VCINSTALLDIR goto :done > + :VS2019Vars > + if exist "%ProgramFiles(x86)%\Microsoft Visual Studio\Installer\vswher= e.exe" ( > + if exist "%ProgramFiles(x86)%\Microsoft Visual Studio\2019\BuildTool= s" ( > + call :set_vsvars "%ProgramFiles(x86)%\Microsoft Visual Studio\Inst= aller\vswhere.exe" -products > Microsoft.VisualStudio.Product.BuildTools -version 16,17 > + ) else ( > + call :set_vsvars "%ProgramFiles(x86)%\Microsoft Visual Studio\Inst= aller\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\vswher= e.exe" ( > if exist "%ProgramFiles(x86)%\Microsoft Visual Studio\2017\BuildTool= s" ( > - call :set_vsvars "%ProgramFiles(x86)%\Microsoft Visual Studio\Inst= aller\vswhere.exe" -products > Microsoft.VisualStudio.Product.BuildTools > + call :set_vsvars "%ProgramFiles(x86)%\Microsoft Visual Studio\Inst= aller\vswhere.exe" -products > Microsoft.VisualStudio.Product.BuildTools -version 15,16 > ) else ( > - call :set_vsvars "%ProgramFiles(x86)%\Microsoft Visual Studio\Inst= aller\vswhere.exe" > + call :set_vsvars "%ProgramFiles(x86)%\Microsoft Visual Studio\Inst= aller\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_env= s.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 fo= lder > @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\vswher= e.exe" ( > + if exist "%ProgramFiles(x86)%\Microsoft Visual Studio\2019\BuildTool= s" ( > + call "%ProgramFiles(x86)%\Microsoft Visual Studio\Installer\vswher= e.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\vswher= e.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\vswh= ere.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\" > + ) > +) > + > :SetVS2017 > if not defined VS150COMNTOOLS ( > if exist "%ProgramFiles(x86)%\Microsoft Visual Studio\Installer\vswher= e.exe" ( > if exist "%ProgramFiles(x86)%\Microsoft Visual Studio\2017\BuildTool= s" ( > - 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\vswher= e.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\vswher= e.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\vswh= ere.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 fo= lder > @REM if the file is not executed within a WORKSPACE\BaseTools folder. > @REM > -@REM Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<= BR> > +@REM Copyright (c) 2006 - 2019, Intel Corporation. All rights reserved.<= BR> > @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 | F= orceRebuild ] [Reconfig] [base_tools_path [edk_tools_path]] > [VS2017] [VS2015] [VS2013] [VS2012]" > + echo Usage: "%0 [-h | -help | --help | /h | /help | /?] [ Rebuild | F= orceRebuild ] [Reconfig] [base_tools_path [edk_tools_path]] > [VS2019] [VS2017] [VS2015] [VS2013] [VS2012]" > @echo. > @echo base_tools_path BaseTools project path, BASE_TOOLS_PAT= H will be set to this path. > @echo edk_tools_path EDK_TOOLS_PATH will be set to this pat= h. > @@ -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.<= BR> > +@REM Copyright (c) 2006 - 2019, Intel Corporation. All rights reserved.<= BR> > @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] [= Rebuild] [ForceRebuild] [VS2017] [VS2015] [VS2013] [VS2012]" > + @echo Usage: "%0 [-h | -help | --help | /h | /help | /?] [Reconfig] [= Rebuild] [ForceRebuild] [VS2019] [VS2017] [VS2015] [VS2013] > [VS2012]" > @echo. > @echo Reconfig Reinstall target.txt, tools_def.txt and b= uild_rule.txt. > @echo Rebuild Perform incremental rebuild of BaseTools = binaries. > @@ -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.t= emplate > @echo will only be copied to target.txt, tools_def.txt and build_rule= .txt > -- > 2.21.0.windows.1