build_llvm_package.bat: Bootstrap with VS 2019

llvm-svn: 372984

diff --git a/llvm/utils/release/build_llvm_package.bat b/llvm/utils/release/build_llvm_package.bat
index af613cd..6c48d20 100755 (executable)
--- a/llvm/utils/release/build_llvm_package.bat
+++ b/llvm/utils/release/build_llvm_package.bat
@@ -8,9 +8,9 @@ REM Usage: build_llvm_package.bat <revision>
 \r
 REM Prerequisites:\r
 REM\r
-REM   Visual Studio 2017, CMake, Ninja, SVN, GNUWin32, SWIG, Python 3,\r
+REM   Visual Studio 2019, CMake, Ninja, SVN, GNUWin32, SWIG, Python 3,\r
 REM   NSIS with the strlen_8192 patch,\r
-REM   Visual Studio 2017 SDK and Nuget (for the clang-format plugin),\r
+REM   Visual Studio 2019 SDK and Nuget (for the clang-format plugin),\r
 REM   Perl (for the OpenMP run-time).\r
 REM\r
 REM\r
@@ -19,7 +19,7 @@ REM   https://github.com/swig/swig/issues/769
 \r
 \r
 REM You need to modify the paths below:\r
-set vsdevcmd=C:\Program Files (x86)\Microsoft Visual Studio\2017\Professional\Common7\Tools\VsDevCmd.bat\r
+set vsdevcmd=C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\Common7\Tools\VsDevCmd.bat\r
 \r
 set python32_dir=C:\Users\%USERNAME%\AppData\Local\Programs\Python\Python36-32\r
 set python64_dir=C:\Users\%USERNAME%\AppData\Local\Programs\Python\Python36\r
@@ -72,8 +72,7 @@ set CC=
 set CXX=\r
 mkdir build32_stage0\r
 cd build32_stage0\r
-REM Work around VS2017 bug by using MinSizeRel.\r
-cmake -GNinja %cmake_flags% -DPYTHON_HOME=%python32_dir% -DPYTHON_EXECUTABLE=%python32_dir%\python.exe -DCMAKE_BUILD_TYPE=MinSizeRel ..\llvm || exit /b\r
+cmake -GNinja %cmake_flags% -DPYTHON_HOME=%python32_dir% -DPYTHON_EXECUTABLE=%python32_dir%\python.exe ..\llvm || exit /b\r
 ninja all || ninja all || ninja all || exit /b\r
 ninja check || ninja check || ninja check || exit /b\r
 ninja check-clang || ninja check-clang || ninja check-clang || exit /b\r
@@ -97,6 +96,8 @@ cd ..
 REM The plug-in is built separately as it uses a statically linked clang-format.exe.\r
 mkdir build_vsix\r
 cd build_vsix\r
+REM Having VSSDKINSTALL set makes devenv *not* find the SDK for some reason.\r
+set VSSDKINSTALL=\r
 set CC=..\build32_stage0\bin\clang-cl\r
 set CXX=..\build32_stage0\bin\clang-cl\r
 cmake -GNinja %cmake_flags% -DLLVM_USE_CRT_RELEASE=MT -DBUILD_CLANG_FORMAT_VS_PLUGIN=ON -DPYTHON_HOME=%python32_dir% -DPYTHON_EXECUTABLE=%python32_dir%\python.exe ..\llvm || exit /b\r
@@ -111,8 +112,7 @@ set CC=
 set CXX=\r
 mkdir build64_stage0\r
 cd build64_stage0\r
-REM Work around VS2017 bug by using MinSizeRel.\r
-cmake -GNinja %cmake_flags% -DPYTHON_HOME=%python64_dir% -DPYTHON_EXECUTABLE=%python64_dir%\python.exe -DCMAKE_BUILD_TYPE=MinSizeRel ..\llvm || exit /b\r
+cmake -GNinja %cmake_flags% -DPYTHON_HOME=%python64_dir% -DPYTHON_EXECUTABLE=%python64_dir%\python.exe ..\llvm || exit /b\r
 ninja all || ninja all || ninja all || exit /b\r
 ninja check || ninja check || ninja check || exit /b\r
 ninja check-clang || ninja check-clang || ninja check-clang || exit /b\r