From nobody Mon Sep 16 18:55:32 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) client-ip=66.175.222.108; envelope-from=bounce+27952+101534+1787277+3901457@groups.io; helo=mail02.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+101534+1787277+3901457@groups.io ARC-Seal: i=1; a=rsa-sha256; t=1679448661; cv=none; d=zohomail.com; s=zohoarc; b=ZmvFNa707yYj9ApDEd32Z8HrqKsA5YWTY3qJNINYJ+cQKg1NEnAWuI5dRwueGJ6C9X8LYZO5t4MArHREtkCZybEAMQWaeLkhjYgGF4qo3wMMloVfMCyMcBd01CViq2QqtIX+wvMRiLpDQUKJUwvk7kYotkmCKE0FTHzP+tqor6U= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1679448660; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To; bh=Xa6y+x2L+EXEQvNmVC1RXUCilX1lIZ8+F1DDme9Fswo=; b=RWgTNmG0KufzYlXHRp6ah5TkZaApPYNER1+F17kwkasIuf+PIxSxK+rRhR1b2iZoxsieJvgcq9MUKQLk1vComiLZc4ncBFab2R0JsCAOngIpMIzWj5rqHI32riTJ/sODgAbecNFfCDy7rLBaf65JKDvEgxFnkUN0pKJ1UXIU7TI= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+101534+1787277+3901457@groups.io Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1679448660990330.2081917847861; Tue, 21 Mar 2023 18:31:00 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id QxrpYY1788612xOvwheZWhaZ; Tue, 21 Mar 2023 18:31:00 -0700 X-Received: from out1-smtp.messagingengine.com (out1-smtp.messagingengine.com [66.111.4.25]) by mx.groups.io with SMTP id smtpd.web10.32737.1679448659397358586 for ; Tue, 21 Mar 2023 18:30:59 -0700 X-Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailout.nyi.internal (Postfix) with ESMTP id BA6715C0055; Tue, 21 Mar 2023 21:30:58 -0400 (EDT) X-Received: from mailfrontend1 ([10.202.2.162]) by compute5.internal (MEProxy); Tue, 21 Mar 2023 21:30:58 -0400 X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvhedrvdeguddgfeejucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne cujfgurhephffvvefufffkofgjfhgggfestdekredtredttdenucfhrhhomheptfgvsggv tggtrgcuvehrrghnuceorhgvsggvtggtrgessghsughiohdrtghomheqnecuggftrfgrth htvghrnhepgeffueeuledvgefgvddvgfetvdduhfefkedukeeikedtudekfeetteeifedv leefnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehmrghilhhfrhhomheprh gvsggvtggtrgessghsughiohdrtghomh X-ME-Proxy: Feedback-ID: i5b994698:Fastmail X-Received: by mail.messagingengine.com (Postfix) with ESMTPA; Tue, 21 Mar 2023 21:30:57 -0400 (EDT) From: "Rebecca Cran" To: devel@edk2.groups.io, Michael D Kinney , Liming Gao , Zhiguang Liu , Bob Feng , Yuwei Chen , Andrew Fish , Leif Lindholm , Ard Biesheuvel , Jordan Justen , Gerd Hoffmann Cc: Rebecca Cran Subject: [edk2-devel] [PATCH 5/9] BaseTools: Remove VS2008-VS2013 remnants Date: Tue, 21 Mar 2023 19:30:36 -0600 Message-Id: <20230322013040.3322865-6-rebecca@bsdio.com> In-Reply-To: <20230322013040.3322865-1-rebecca@bsdio.com> References: <20230322013040.3322865-1-rebecca@bsdio.com> MIME-Version: 1.0 Precedence: Bulk List-Unsubscribe: List-Subscribe: List-Help: 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,rebecca@bsdio.com X-Gm-Message-State: sWUwsu4ELt8IbsodHd4iAcrwx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1679448660; bh=2yv2A9Ff6NAmDgP8QVK4Fn3tCF9Fxn+DKUQFrtZlwAY=; h=Cc:Date:From:Reply-To:Subject:To; b=cRyHj1+h0OKv8WX3ajfBlfP2kjN+ZkHmnpWr/7ZvSDcXMqsY70SnaatWlgk9rvh6Z2T KjHA2vDmnBQwB82rj0gSOVVAWA5h25aqpzDuRx4mfH3+vz0YEd8xwawLOkxWoqUcZ/3yg /WOFM1vBJ4mvHafKZ3n+9OiZ0NUdqPUDJNM= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1679448662633100014 Content-Type: text/plain; charset="utf-8" Remove remnants of Visual Studio 2008-2013 support from Signed-off-by: Rebecca Cran --- BaseTools/Conf/tools_def.template | 12 ---- BaseTools/Scripts/SetVisualStudio.bat | 22 +------ BaseTools/Scripts/ShowEnvironment.bat | 44 -------------- BaseTools/get_vsvars.bat | 13 ---- BaseTools/set_vsprefix_envs.bat | 64 -------------------- BaseTools/toolsetup.bat | 24 +------- 6 files changed, 2 insertions(+), 177 deletions(-) diff --git a/BaseTools/Conf/tools_def.template b/BaseTools/Conf/tools_def.t= emplate index b8914e4b6484..4ca455214be5 100755 --- a/BaseTools/Conf/tools_def.template +++ b/BaseTools/Conf/tools_def.template @@ -53,18 +53,6 @@ DEFINE RC_PATH =3D ENV(WINSDK_PATH_FOR_RC_EXE)\rc.exe 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) - -# 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) - -# Microsoft Visual Studio 2013 Professional Edition -DEFINE WINSDK8_BIN =3D ENV(WINSDK8_PREFIX)x86\ -DEFINE WINSDK8x86_BIN =3D ENV(WINSDK8x86_PREFIX)x64 - # Microsoft Visual Studio 2015 Professional Edition DEFINE WINSDK81_BIN =3D ENV(WINSDK81_PREFIX)x86\ DEFINE WINSDK81x86_BIN =3D ENV(WINSDK81x86_PREFIX)x64 diff --git a/BaseTools/Scripts/SetVisualStudio.bat b/BaseTools/Scripts/SetV= isualStudio.bat index 60d493a4110d..fba9f846effb 100755 --- a/BaseTools/Scripts/SetVisualStudio.bat +++ b/BaseTools/Scripts/SetVisualStudio.bat @@ -2,7 +2,7 @@ @REM Windows batch file to set up the Microsoft Visual Studio environment @REM @REM This script is used to set up one of the Microsoft Visual Studio -@REM environments, VS2008x86, VS2010x86, VS2012x86 or VS2013x86 for +@REM environments, VS2015 for @REM building the Nt32Pkg/Nt32Pkg.dsc emulation environment to run on @REM an X64 version of Windows. @REM The system environment variables in this script are set by the @@ -23,26 +23,6 @@ echo. @set "COMMONTOOLSx64=3DC:\Program Files (x86)\Microsoft Visual Studio 1= 4.0\VC\bin\x86_amd64" @goto SetVs ) - -@if defined VS120COMNTOOLS ( - @set "COMMONTOOLSx64=3DC:\Program Files (x86)\Microsoft Visual Studio 1= 2.0\VC\bin\x86_amd64" - @goto SetVs -) - -@if defined VS110COMNTOOLS ( - @set "COMMONTOOLSx64=3DC:\Program Files (x86)\Microsoft Visual Studio 1= 1.0\VC\bin\x86_amd64" - @goto SetVs -) - -@if defined VS100COMNTOOLS ( - @set "COMMONTOOLSx64=3DC:\Program Files (x86)\Microsoft Visual Studio 1= 0.0\VC\bin\x86_amd64" - @goto SetVs -) - -@if defined VS90COMNTOOLS ( - @set "COMMONTOOLSx64=3DC:\Program Files (x86)\Microsoft Visual Studio 9= .0\VC\bin\x86_amd64" - @goto SetVs -) @echo. @echo No version of Microsoft Visual Studio was found on this system @echo. diff --git a/BaseTools/Scripts/ShowEnvironment.bat b/BaseTools/Scripts/Show= Environment.bat index b91886b6a955..1301d5fcb11b 100755 --- a/BaseTools/Scripts/ShowEnvironment.bat +++ b/BaseTools/Scripts/ShowEnvironment.bat @@ -80,50 +80,6 @@ if defined SRC_CONF @goto SetEnv @goto End =20 :CheckVsVer -@set "TEST_VS=3DC:\Program Files (x86)\Microsoft Visual Studio 9.0\" -@if "%VSINSTALLDIR%"=3D=3D"%TEST_VS%" ( - @echo TOOL_CHAIN_TAG =3D VS2008x86 - @goto :EOF -) -@set "TEST_VS=3DC:\Program Files\Microsoft Visual Studio 9.0\" -@if "%VSINSTALLDIR%"=3D=3D"%TEST_VS%" ( - @echo TOOL_CHAIN_TAG =3D VS2008 - @goto :EOF -) - -@set "TEST_VS=3DC:\Program Files (x86)\Microsoft Visual Studio 10.0\" -@if "%VSINSTALLDIR%"=3D=3D"%TEST_VS%" ( - @echo TOOL_CHAIN_TAG =3D VS2010x86 - @goto :EOF -) -@set "TEST_VS=3DC:\Program Files\Microsoft Visual Studio 10.0\" -@if "%VSINSTALLDIR%"=3D=3D"%TEST_VS%" ( - @echo TOOL_CHAIN_TAG =3D VS2010 - @goto :EOF -) - -@set "TEST_VS=3DC:\Program Files (x86)\Microsoft Visual Studio 11.0\" -@if "%VSINSTALLDIR%"=3D=3D"%TEST_VS%" ( - @echo TOOL_CHAIN_TAG =3D VS2012x86 - @goto :EOF -) -@set "TEST_VS=3DC:\Program Files\Microsoft Visual Studio 11.0\" -@if "%VSINSTALLDIR%"=3D=3D"%TEST_VS%" ( - @echo TOOL_CHAIN_TAG =3D VS2012 - @goto :EOF -) - -@set "TEST_VS=3DC:\Program Files (x86)\Microsoft Visual Studio 12.0\" -@if "%VSINSTALLDIR%"=3D=3D"%TEST_VS%" ( - @echo TOOL_CHAIN_TAG =3D VS2013x86 - @goto :EOF -) -@set "TEST_VS=3DC:\Program Files\Microsoft Visual Studio 12.0\" -@if "%VSINSTALLDIR%"=3D=3D"%TEST_VS%" ( - @echo TOOL_CHAIN_TAG =3D VS2013 - @goto :EOF -) - @set "TEST_VS=3DC:\Program Files (x86)\Microsoft Visual Studio 14.0\" @if "%VSINSTALLDIR%"=3D=3D"%TEST_VS%" ( @echo TOOL_CHAIN_TAG =3D VS2015x86 diff --git a/BaseTools/get_vsvars.bat b/BaseTools/get_vsvars.bat index 3beb113be296..b67e147ee61a 100644 --- a/BaseTools/get_vsvars.bat +++ b/BaseTools/get_vsvars.bat @@ -13,8 +13,6 @@ 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 if defined VCINSTALLDIR goto :EOF @@ -85,16 +83,5 @@ if defined VCINSTALLDIR goto :done :VS2015Vars if defined VS140COMNTOOLS (call :read_vsvars "%VS140COMNTOOLS%") else (= if /I "%1"=3D=3D"VS2015" goto ToolNotInstall) =20 - :VS2013Vars - if defined VS120COMNTOOLS ( call :read_vsvars "%VS120COMNTOOLS%") else = (if /I "%1"=3D=3D"VS2013" goto ToolNotInstall) - - :VS2012Vars - if defined VS110COMNTOOLS (call :read_vsvars "%VS110COMNTOOLS%") else (= if /I "%1"=3D=3D"VS2012" goto ToolNotInstall) - - if defined VS100COMNTOOLS call :read_vsvars "%VS100COMNTOOLS%" - if defined VS90COMNTOOLS call :read_vsvars "%VS90COMNTOOLS%" - if defined VS80COMNTOOLS call :read_vsvars "%VS80COMNTOOLS%" - if defined VS71COMNTOOLS call :read_vsvars "%VS71COMNTOOLS%" - :done set GET_VSVARS_BAT_CHECK_DIR=3D diff --git a/BaseTools/set_vsprefix_envs.bat b/BaseTools/set_vsprefix_envs.= bat index d4eb84f0648d..0b9a0c75b975 100644 --- a/BaseTools/set_vsprefix_envs.bat +++ b/BaseTools/set_vsprefix_envs.bat @@ -21,8 +21,6 @@ goto :EOF 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 -if /I "%1"=3D=3D"VS2012" goto SetVS2012 =20 if defined VS71COMNTOOLS ( if not defined VS2003_PREFIX ( @@ -30,68 +28,6 @@ if defined VS71COMNTOOLS ( ) ) =20 -if defined VS80COMNTOOLS ( - if not defined VS2005_PREFIX ( - set "VS2005_PREFIX=3D%VS80COMNTOOLS:~0,-14%" - ) -) - -if defined VS90COMNTOOLS ( - if not defined VS2008_PREFIX ( - set "VS2008_PREFIX=3D%VS90COMNTOOLS:~0,-14%" - ) - if not defined WINSDK_PREFIX ( - set "WINSDK_PREFIX=3Dc:\Program Files\Microsoft SDKs\Windows\v6.0A\bin= \" - ) - if not defined WINSDKx86_PREFIX ( - set "WINSDKx86_PREFIX=3Dc:\Program Files (x86)\Microsoft SDKs\Windows\= v6.0A\bin\" - ) -) - -if defined VS100COMNTOOLS ( - if not defined VS2010_PREFIX ( - set "VS2010_PREFIX=3D%VS100COMNTOOLS:~0,-14%" - ) - if not defined WINSDK7_PREFIX ( - set "WINSDK7_PREFIX=3Dc:\Program Files\Microsoft SDKs\Windows\v7.0A\Bi= n\" - ) - if not defined WINSDK7x86_PREFIX ( - set "WINSDK7x86_PREFIX=3Dc:\Program Files (x86)\Microsoft SDKs\Windows= \v7.0A\Bin\" - ) -) - -:SetVS2012 -if defined VS110COMNTOOLS ( - if not defined VS2012_PREFIX ( - set "VS2012_PREFIX=3D%VS110COMNTOOLS:~0,-14%" - ) - if not defined WINSDK71_PREFIX ( - set "WINSDK71_PREFIX=3Dc:\Program Files\Microsoft SDKs\Windows\v7.1A\B= in\" - ) - if not defined WINSDK71x86_PREFIX ( - set "WINSDK71x86_PREFIX=3Dc:\Program Files (x86)\Microsoft SDKs\Window= s\v7.1A\Bin\" - ) -) else ( - if /I "%1"=3D=3D"VS2012" goto ToolNotInstall -) -if /I "%1"=3D=3D"VS2012" goto SetWinDDK - -:SetVS2013 -if defined VS120COMNTOOLS ( - if not defined VS2013_PREFIX ( - set "VS2013_PREFIX=3D%VS120COMNTOOLS:~0,-14%" - ) - if not defined WINSDK8_PREFIX ( - set "WINSDK8_PREFIX=3Dc:\Program Files\Windows Kits\8.0\bin\" - ) - if not defined WINSDK8x86_PREFIX ( - set "WINSDK8x86_PREFIX=3Dc:\Program Files (x86)\Windows Kits\8.0\bin\" - ) -) else ( - if /I "%1"=3D=3D"VS2013" goto ToolNotInstall -) -if /I "%1"=3D=3D"VS2013" goto SetWinDDK - :SetVS2015 if defined VS140COMNTOOLS ( if not defined VS2015_PREFIX ( diff --git a/BaseTools/toolsetup.bat b/BaseTools/toolsetup.bat index 58fd26a4b585..25d13d559cd6 100755 --- a/BaseTools/toolsetup.bat +++ b/BaseTools/toolsetup.bat @@ -60,18 +60,6 @@ if /I "%1"=3D=3D"/?" goto Usage set VSTool=3DVS2015 goto loop ) - if /I "%1"=3D=3D"VS2013" ( - shift - set VS2013=3DTRUE - set VSTool=3DVS2013 - goto loop - ) - if /I "%1"=3D=3D"VS2012" ( - shift - set VS2012=3DTRUE - set VSTool=3DVS2012 - goto loop - ) if "%1"=3D=3D"" goto setup_workspace if exist %1 ( if not defined BASE_TOOLS_PATH ( @@ -189,12 +177,6 @@ if defined VS2019 ( ) else if defined VS2015 ( call %EDK_TOOLS_PATH%\set_vsprefix_envs.bat VS2015 call %EDK_TOOLS_PATH%\get_vsvars.bat VS2015 -) else if defined VS2013 ( - call %EDK_TOOLS_PATH%\set_vsprefix_envs.bat VS2013 - call %EDK_TOOLS_PATH%\get_vsvars.bat VS2013 -) else if defined VS2012 ( - call %EDK_TOOLS_PATH%\set_vsprefix_envs.bat VS2012 - call %EDK_TOOLS_PATH%\get_vsvars.bat VS2012 ) else ( call %EDK_TOOLS_PATH%\set_vsprefix_envs.bat call %EDK_TOOLS_PATH%\get_vsvars.bat @@ -472,7 +454,7 @@ goto end =20 :Usage @echo. - echo Usage: "%0 [-h | -help | --help | /h | /help | /?] [ Rebuild | For= ceRebuild ] [Reconfig] [base_tools_path [edk_tools_path]] [VS2019] [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]" @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. @@ -481,8 +463,6 @@ goto end @echo ForceRebuild If sources are available, rebuild all to= ols regardless of @echo whether they have been updated or not. @echo Reconfig Reinstall target.txt, tools_def.txt and = build_rule.txt. - @echo VS2012 Set the env for VS2012 build. - @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. @@ -495,8 +475,6 @@ set RECONFIG=3D set VS2019=3D set VS2017=3D set VS2015=3D -set VS2013=3D -set VS2012=3D set VSTool=3D popd =20 --=20 2.34.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 (#101534): https://edk2.groups.io/g/devel/message/101534 Mute This Topic: https://groups.io/mt/97769548/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-