From 41045478ab7fd3efc989952bfd7a83c5cbb88dbc Mon Sep 17 00:00:00 2001 From: Ray Molenkamp Date: Tue, 17 Jul 2018 14:44:47 -0600 Subject: make.bat: remove msvc2013 support. --- build_files/windows/autodetect_msvc.cmd | 5 +-- build_files/windows/check_libraries.cmd | 1 - build_files/windows/detect_msvc2013.cmd | 3 -- build_files/windows/detect_msvc_classic.cmd | 69 ----------------------------- build_files/windows/parse_arguments.cmd | 2 - build_files/windows/show_help.cmd | 8 ++-- 6 files changed, 5 insertions(+), 83 deletions(-) delete mode 100644 build_files/windows/detect_msvc2013.cmd delete mode 100644 build_files/windows/detect_msvc_classic.cmd (limited to 'build_files/windows') diff --git a/build_files/windows/autodetect_msvc.cmd b/build_files/windows/autodetect_msvc.cmd index 6fce3829e7b..77dc005cd18 100644 --- a/build_files/windows/autodetect_msvc.cmd +++ b/build_files/windows/autodetect_msvc.cmd @@ -1,14 +1,11 @@ echo No explicit msvc version requested, autodetecting version. -call "%~dp0\detect_msvc2013.cmd" +call "%~dp0\detect_msvc2017.cmd" if %ERRORLEVEL% EQU 0 goto DetectionComplete call "%~dp0\detect_msvc2015.cmd" if %ERRORLEVEL% EQU 0 goto DetectionComplete -call "%~dp0\detect_msvc2017.cmd" -if %ERRORLEVEL% EQU 0 goto DetectionComplete - echo Compiler Detection failed. Use verbose switch for more information. exit /b 1 diff --git a/build_files/windows/check_libraries.cmd b/build_files/windows/check_libraries.cmd index c8aad7c9adb..6ad1d1749c3 100644 --- a/build_files/windows/check_libraries.cmd +++ b/build_files/windows/check_libraries.cmd @@ -1,4 +1,3 @@ -if "%BUILD_VS_YEAR%"=="2013" set BUILD_VS_LIBDIRPOST=vc12 if "%BUILD_VS_YEAR%"=="2015" set BUILD_VS_LIBDIRPOST=vc14 if "%BUILD_VS_YEAR%"=="2017" set BUILD_VS_LIBDIRPOST=vc14 diff --git a/build_files/windows/detect_msvc2013.cmd b/build_files/windows/detect_msvc2013.cmd deleted file mode 100644 index 5688d31c4b6..00000000000 --- a/build_files/windows/detect_msvc2013.cmd +++ /dev/null @@ -1,3 +0,0 @@ -set BUILD_VS_VER=12 -set BUILD_VS_YEAR=2013 -call "%~dp0\detect_msvc_classic.cmd" \ No newline at end of file diff --git a/build_files/windows/detect_msvc_classic.cmd b/build_files/windows/detect_msvc_classic.cmd deleted file mode 100644 index 61bfcf92ddf..00000000000 --- a/build_files/windows/detect_msvc_classic.cmd +++ /dev/null @@ -1,69 +0,0 @@ -if NOT "%verbose%" == "" ( - echo Detecting msvc %BUILD_VS_YEAR% -) -set KEY_NAME="HKEY_LOCAL_MACHINE\SOFTWARE\Wow6432Node\Microsoft\VisualStudio\%BUILD_VS_VER%.0\Setup\VC" -for /F "usebackq skip=2 tokens=1-2*" %%A IN (`REG QUERY %KEY_NAME% /v ProductDir 2^>nul`) DO set MSVC_VC_DIR=%%C -if DEFINED MSVC_VC_DIR ( - if NOT "%verbose%" == "" ( - echo Visual Studio %BUILD_VS_YEAR% on Win64 detected at "%MSVC_VC_DIR%" - ) - goto msvc_detect_finally -) - -REM Check 32 bits -set KEY_NAME="HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\VisualStudio\%BUILD_VS_VER%.0\Setup\VC" -for /F "usebackq skip=2 tokens=1-2*" %%A IN (`REG QUERY %KEY_NAME% /v ProductDir 2^>nul`) DO set MSVC_VC_DIR=%%C -if DEFINED MSVC_VC_DIR ( - if NOT "%verbose%" == "" ( - echo Visual Studio %BUILD_VS_YEAR% on Win32 detected at "%MSVC_VC_DIR%" - ) - goto msvc_detect_finally -) -if NOT "%verbose%" == "" ( - echo Visual Studio %BUILD_VS_YEAR% not found. -) -goto FAIL -:msvc_detect_finally -set VCVARS=%MSVC_VC_DIR%\vcvarsall.bat -if not exist "%VCVARS%" ( - echo "%VCVARS%" not found. - goto FAIL -) - -call "%vcvars%" %BUILD_ARCH% - -rem try msbuild -msbuild /version > NUL -if errorlevel 1 ( - if NOT "%verbose%" == "" ( - echo Visual Studio %BUILD_VS_YEAR% msbuild not found - ) - goto FAIL -) - -if NOT "%verbose%" == "" ( - echo Visual Studio %BUILD_VS_YEAR% msbuild found -) - -REM try the c++ compiler -cl 2> NUL 1>&2 -if errorlevel 1 ( - if NOT "%verbose%" == "" ( - echo Visual Studio %BUILD_VS_YEAR% C/C++ Compiler not found - ) - goto FAIL -) - -if NOT "%verbose%" == "" ( - echo Visual Studio %BUILD_VS_YEAR% C/C++ Compiler found -) -goto DetectionComplete - -:FAIL -exit /b 1 - -:DetectionComplete -if NOT "%verbose%" == "" ( - echo Visual Studio %BUILD_VS_YEAR% Detected successfuly -) -exit /b 0 diff --git a/build_files/windows/parse_arguments.cmd b/build_files/windows/parse_arguments.cmd index 8a6d743978d..e8caddaf4ea 100644 --- a/build_files/windows/parse_arguments.cmd +++ b/build_files/windows/parse_arguments.cmd @@ -59,8 +59,6 @@ if NOT "%1" == "" ( set VSWHERE_ARGS=-products Microsoft.VisualStudio.Product.BuildTools ) else if "%1" == "2015" ( set BUILD_VS_YEAR=2015 - ) else if "%1" == "2013" ( - set BUILD_VS_YEAR=2013 ) else if "%1" == "packagename" ( set BUILD_CMAKE_ARGS=%BUILD_CMAKE_ARGS% -DCPACK_OVERRIDE_PACKAGENAME="%2" shift /1 diff --git a/build_files/windows/show_help.cmd b/build_files/windows/show_help.cmd index 2b297120f4b..694b28c88ed 100644 --- a/build_files/windows/show_help.cmd +++ b/build_files/windows/show_help.cmd @@ -22,13 +22,13 @@ echo - packagename [newname] ^(override default cpack package name^) echo - buildir [newdir] ^(override default build folder^) echo - x86 ^(override host auto-detect and build 32 bit code^) echo - x64 ^(override host auto-detect and build 64 bit code^) -echo - 2013 ^(build with visual studio 2013^) -echo. -echo Experimental options -echo - 2015 ^(build with visual studio 2015^) echo - 2017 ^(build with visual studio 2017^) echo - 2017pre ^(build with visual studio 2017 pre-release^) echo - 2017b ^(build with visual studio 2017 Build Tools^) + +echo. +echo Experimental options +echo - 2015 ^(build with visual studio 2015^) echo - clang ^(enable building with clang^) echo - asan ^(enable asan when building with clang^) echo - ninja ^(enable building with ninja instead of msbuild^) -- cgit v1.2.3