mirror of
				https://gitlab.com/qemu-project/edk2.git
				synced 2025-10-30 07:56:39 +08:00 
			
		
		
		
	BaseTools: Remove VS2008-VS2013 remnants
Remove remnants of Visual Studio 2008-2013 support from Conf/tools_def.txt and various batch scripts. Signed-off-by: Rebecca Cran <rebecca@bsdio.com> Reviewed-by: Oliver Smith-Denny <osd@smith-denny.com> Reviewed-by: Liming Gao <gaoliming@byosoft.com.cn> Reviewed-by: Michael D Kinney <michael.d.kinney@intel.com> Tested-by: Michael D Kinney <michael.d.kinney@intel.com>
This commit is contained in:
		 Rebecca Cran
					Rebecca Cran
				
			
				
					committed by
					
						![mergify[bot]](/assets/img/avatar_default.png) mergify[bot]
						mergify[bot]
					
				
			
			
				
	
			
			
			![mergify[bot]](/assets/img/avatar_default.png) mergify[bot]
						mergify[bot]
					
				
			
						parent
						
							0363584ac9
						
					
				
				
					commit
					c3ac3301e9
				
			| @ -53,18 +53,6 @@ DEFINE RC_PATH    = ENV(WINSDK_PATH_FOR_RC_EXE)\rc.exe | ||||
| DEFINE WINSDK_BIN           = ENV(WINSDK_PREFIX) | ||||
| DEFINE WINSDKx86_BIN        = ENV(WINSDKx86_PREFIX) | ||||
|  | ||||
| # Microsoft Visual Studio 2010 | ||||
| DEFINE WINSDK7_BIN          = ENV(WINSDK7_PREFIX) | ||||
| DEFINE WINSDK7x86_BIN       = ENV(WINSDK7x86_PREFIX) | ||||
|  | ||||
| # Microsoft Visual Studio 2012 Update 1 (required for rc.exe that was not included in the initial release) | ||||
| DEFINE WINSDK71_BIN         = ENV(WINSDK71_PREFIX) | ||||
| DEFINE WINSDK71x86_BIN      = ENV(WINSDK71x86_PREFIX) | ||||
|  | ||||
| # Microsoft Visual Studio 2013 Professional Edition | ||||
| DEFINE WINSDK8_BIN          = ENV(WINSDK8_PREFIX)x86\ | ||||
| DEFINE WINSDK8x86_BIN       = ENV(WINSDK8x86_PREFIX)x64 | ||||
|  | ||||
| # Microsoft Visual Studio 2015 Professional Edition | ||||
| DEFINE WINSDK81_BIN         = ENV(WINSDK81_PREFIX)x86\ | ||||
| DEFINE WINSDK81x86_BIN      = ENV(WINSDK81x86_PREFIX)x64 | ||||
|  | ||||
| @ -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=C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\bin\x86_amd64" | ||||
|    @goto SetVs | ||||
| ) | ||||
|  | ||||
| @if defined VS120COMNTOOLS ( | ||||
|    @set "COMMONTOOLSx64=C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\bin\x86_amd64" | ||||
|    @goto SetVs | ||||
| ) | ||||
|  | ||||
| @if defined VS110COMNTOOLS ( | ||||
|    @set "COMMONTOOLSx64=C:\Program Files (x86)\Microsoft Visual Studio 11.0\VC\bin\x86_amd64" | ||||
|    @goto SetVs | ||||
| ) | ||||
|  | ||||
| @if defined VS100COMNTOOLS ( | ||||
|    @set "COMMONTOOLSx64=C:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\bin\x86_amd64" | ||||
|    @goto SetVs | ||||
| ) | ||||
|  | ||||
| @if defined VS90COMNTOOLS ( | ||||
|    @set "COMMONTOOLSx64=C:\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. | ||||
|  | ||||
| @ -80,50 +80,6 @@ if defined SRC_CONF @goto SetEnv | ||||
| @goto End | ||||
|  | ||||
| :CheckVsVer | ||||
| @set "TEST_VS=C:\Program Files (x86)\Microsoft Visual Studio 9.0\" | ||||
| @if "%VSINSTALLDIR%"=="%TEST_VS%" ( | ||||
|     @echo     TOOL_CHAIN_TAG       = VS2008x86 | ||||
|     @goto :EOF | ||||
| ) | ||||
| @set "TEST_VS=C:\Program Files\Microsoft Visual Studio 9.0\" | ||||
| @if "%VSINSTALLDIR%"=="%TEST_VS%" ( | ||||
|     @echo     TOOL_CHAIN_TAG       = VS2008 | ||||
|     @goto :EOF | ||||
| ) | ||||
|  | ||||
| @set "TEST_VS=C:\Program Files (x86)\Microsoft Visual Studio 10.0\" | ||||
| @if "%VSINSTALLDIR%"=="%TEST_VS%" ( | ||||
|     @echo     TOOL_CHAIN_TAG       = VS2010x86 | ||||
|     @goto :EOF | ||||
| ) | ||||
| @set "TEST_VS=C:\Program Files\Microsoft Visual Studio 10.0\" | ||||
| @if "%VSINSTALLDIR%"=="%TEST_VS%" ( | ||||
|     @echo     TOOL_CHAIN_TAG       = VS2010 | ||||
|     @goto :EOF | ||||
| ) | ||||
|  | ||||
| @set "TEST_VS=C:\Program Files (x86)\Microsoft Visual Studio 11.0\" | ||||
| @if "%VSINSTALLDIR%"=="%TEST_VS%" ( | ||||
|     @echo     TOOL_CHAIN_TAG       = VS2012x86 | ||||
|     @goto :EOF | ||||
| ) | ||||
| @set "TEST_VS=C:\Program Files\Microsoft Visual Studio 11.0\" | ||||
| @if "%VSINSTALLDIR%"=="%TEST_VS%" ( | ||||
|     @echo     TOOL_CHAIN_TAG       = VS2012 | ||||
|     @goto :EOF | ||||
| ) | ||||
|  | ||||
| @set "TEST_VS=C:\Program Files (x86)\Microsoft Visual Studio 12.0\" | ||||
| @if "%VSINSTALLDIR%"=="%TEST_VS%" ( | ||||
|     @echo     TOOL_CHAIN_TAG       = VS2013x86 | ||||
|     @goto :EOF | ||||
| ) | ||||
| @set "TEST_VS=C:\Program Files\Microsoft Visual Studio 12.0\" | ||||
| @if "%VSINSTALLDIR%"=="%TEST_VS%" ( | ||||
|     @echo     TOOL_CHAIN_TAG       = VS2013 | ||||
|     @goto :EOF | ||||
| ) | ||||
|  | ||||
| @set "TEST_VS=C:\Program Files (x86)\Microsoft Visual Studio 14.0\" | ||||
| @if "%VSINSTALLDIR%"=="%TEST_VS%" ( | ||||
|     @echo     TOOL_CHAIN_TAG       = VS2015x86 | ||||
|  | ||||
| @ -13,8 +13,6 @@ if "%1"=="" goto main | ||||
| if /I "%1"=="VS2019" goto VS2019Vars | ||||
| if /I "%1"=="VS2017" goto VS2017Vars | ||||
| if /I "%1"=="VS2015" goto VS2015Vars | ||||
| if /I "%1"=="VS2013" goto VS2013Vars | ||||
| if /I "%1"=="VS2012" goto VS2012Vars | ||||
|  | ||||
| :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"=="VS2015" goto ToolNotInstall) | ||||
|  | ||||
|   :VS2013Vars | ||||
|   if defined VS120COMNTOOLS ( call :read_vsvars  "%VS120COMNTOOLS%") else (if /I "%1"=="VS2013" goto ToolNotInstall) | ||||
|  | ||||
|   :VS2012Vars | ||||
|   if defined VS110COMNTOOLS (call :read_vsvars  "%VS110COMNTOOLS%") else (if /I "%1"=="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= | ||||
|  | ||||
| @ -21,8 +21,6 @@ goto :EOF | ||||
| if /I "%1"=="VS2019" goto SetVS2019 | ||||
| if /I "%1"=="VS2017" goto SetVS2017 | ||||
| if /I "%1"=="VS2015" goto SetVS2015 | ||||
| if /I "%1"=="VS2013" goto SetVS2013 | ||||
| if /I "%1"=="VS2012" goto SetVS2012 | ||||
|  | ||||
| if defined VS71COMNTOOLS ( | ||||
|   if not defined VS2003_PREFIX ( | ||||
| @ -30,68 +28,6 @@ if defined VS71COMNTOOLS ( | ||||
|   ) | ||||
| ) | ||||
|  | ||||
| if defined VS80COMNTOOLS ( | ||||
|   if not defined VS2005_PREFIX ( | ||||
|     set "VS2005_PREFIX=%VS80COMNTOOLS:~0,-14%" | ||||
|   ) | ||||
| ) | ||||
|  | ||||
| if defined VS90COMNTOOLS ( | ||||
|   if not defined VS2008_PREFIX ( | ||||
|     set "VS2008_PREFIX=%VS90COMNTOOLS:~0,-14%" | ||||
|   ) | ||||
|   if not defined WINSDK_PREFIX ( | ||||
|     set "WINSDK_PREFIX=c:\Program Files\Microsoft SDKs\Windows\v6.0A\bin\" | ||||
|   ) | ||||
|   if not defined WINSDKx86_PREFIX ( | ||||
|     set "WINSDKx86_PREFIX=c:\Program Files (x86)\Microsoft SDKs\Windows\v6.0A\bin\" | ||||
|   ) | ||||
| ) | ||||
|  | ||||
| if defined VS100COMNTOOLS ( | ||||
|   if not defined VS2010_PREFIX ( | ||||
|     set "VS2010_PREFIX=%VS100COMNTOOLS:~0,-14%" | ||||
|   ) | ||||
|   if not defined WINSDK7_PREFIX ( | ||||
|     set "WINSDK7_PREFIX=c:\Program Files\Microsoft SDKs\Windows\v7.0A\Bin\" | ||||
|   ) | ||||
|   if not defined WINSDK7x86_PREFIX ( | ||||
|     set "WINSDK7x86_PREFIX=c:\Program Files (x86)\Microsoft SDKs\Windows\v7.0A\Bin\" | ||||
|   ) | ||||
| ) | ||||
|  | ||||
| :SetVS2012 | ||||
| if defined VS110COMNTOOLS ( | ||||
|   if not defined VS2012_PREFIX ( | ||||
|     set "VS2012_PREFIX=%VS110COMNTOOLS:~0,-14%" | ||||
|   ) | ||||
|   if not defined WINSDK71_PREFIX ( | ||||
|     set "WINSDK71_PREFIX=c:\Program Files\Microsoft SDKs\Windows\v7.1A\Bin\" | ||||
|   ) | ||||
|   if not defined WINSDK71x86_PREFIX ( | ||||
|     set "WINSDK71x86_PREFIX=c:\Program Files (x86)\Microsoft SDKs\Windows\v7.1A\Bin\" | ||||
|   ) | ||||
| ) else ( | ||||
|   if /I "%1"=="VS2012" goto ToolNotInstall | ||||
| ) | ||||
| if /I "%1"=="VS2012" goto SetWinDDK | ||||
|  | ||||
| :SetVS2013 | ||||
| if defined VS120COMNTOOLS ( | ||||
|   if not defined VS2013_PREFIX ( | ||||
|     set "VS2013_PREFIX=%VS120COMNTOOLS:~0,-14%" | ||||
|   ) | ||||
|   if not defined WINSDK8_PREFIX ( | ||||
|     set "WINSDK8_PREFIX=c:\Program Files\Windows Kits\8.0\bin\" | ||||
|   ) | ||||
|   if not defined WINSDK8x86_PREFIX ( | ||||
|     set "WINSDK8x86_PREFIX=c:\Program Files (x86)\Windows Kits\8.0\bin\" | ||||
|   ) | ||||
| ) else ( | ||||
|   if /I "%1"=="VS2013" goto ToolNotInstall | ||||
| ) | ||||
| if /I "%1"=="VS2013" goto SetWinDDK | ||||
|  | ||||
| :SetVS2015 | ||||
| if defined VS140COMNTOOLS ( | ||||
|   if not defined VS2015_PREFIX ( | ||||
|  | ||||
| @ -60,18 +60,6 @@ if /I "%1"=="/?" goto Usage | ||||
|     set VSTool=VS2015 | ||||
|     goto loop | ||||
|   ) | ||||
|   if /I "%1"=="VS2013" ( | ||||
|     shift | ||||
|     set VS2013=TRUE | ||||
|     set VSTool=VS2013 | ||||
|     goto loop | ||||
|   ) | ||||
|   if /I "%1"=="VS2012" ( | ||||
|     shift | ||||
|     set VS2012=TRUE | ||||
|     set VSTool=VS2012 | ||||
|     goto loop | ||||
|   ) | ||||
|   if "%1"=="" 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 | ||||
|  | ||||
| :Usage | ||||
|   @echo. | ||||
|   echo  Usage: "%0 [-h | -help | --help | /h | /help | /?] [ Rebuild | ForceRebuild ] [Reconfig] [base_tools_path [edk_tools_path]] [VS2019] [VS2017] [VS2015] [VS2013] [VS2012]" | ||||
|   echo  Usage: "%0 [-h | -help | --help | /h | /help | /?] [ Rebuild | ForceRebuild ] [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 tools 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= | ||||
| set VS2019= | ||||
| set VS2017= | ||||
| set VS2015= | ||||
| set VS2013= | ||||
| set VS2012= | ||||
| set VSTool= | ||||
| popd | ||||
|  | ||||
|  | ||||
		Reference in New Issue
	
	Block a user