build_llvm_package.bat: Move to VS2017

It's required for building the clang-format plugin after r300225.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@300273 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/utils/release/build_llvm_package.bat b/utils/release/build_llvm_package.bat
index 5e3f2ae6e5479e2986c15a279d2df65f9fe44427..eca74347cf3e75f490417eb8f8bfae7527bd5c14 100755 (executable)
--- a/utils/release/build_llvm_package.bat
+++ b/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 2015, CMake, Ninja, SVN, GNUWin32, SWIG, Python 3,\r
+REM   Visual Studio 2017, CMake, Ninja, SVN, GNUWin32, SWIG, Python 3,\r
 REM   NSIS with the strlen_8192 patch,\r
-REM   Visual Studio 2015 SDK (for the clang-format plugin).\r
+REM   Visual Studio 2017 SDK (for the clang-format plugin).\r
 REM\r
 REM\r
 REM   For LLDB, SWIG version <= 3.0.8 needs to be used to work around\r
@@ -18,7 +18,8 @@ REM   https://github.com/swig/swig/issues/769
 \r
 \r
 REM You need to modify the paths below:\r
-set vcdir=c:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\r
+set vsdevcmd=C:\Program Files (x86)\Microsoft Visual Studio\2017\Professional\Common7\Tools\VsDevCmd.bat\r
+\r
 set python32_dir=C:\Users\hwennborg\AppData\Local\Programs\Python\Python35-32\r
 set python64_dir=C:\Users\hwennborg\AppData\Local\Programs\Python\Python35\r
 set PATH=%PATH%;c:\gnuwin32\bin\r
@@ -55,7 +56,7 @@ set cmake_flags=-DCMAKE_BUILD_TYPE=Release -DLLVM_ENABLE_ASSERTIONS=ON -DLLVM_IN
 \r
 REM TODO: Run all tests, including lld and compiler-rt.\r
 \r
-call "%vcdir%/vcvarsall.bat" x86\r
+call "%vsdevcmd%" -arch=x86\r
 set CC=\r
 set CXX=\r
 mkdir build32_stage0\r
@@ -74,11 +75,10 @@ cmake -GNinja %cmake_flags% -DPYTHON_HOME=%python32_dir% ..\llvm || exit /b
 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
-copy ..\llvm\tools\clang\tools\clang-format-vs\ClangFormat\bin\Release\ClangFormat.vsix ClangFormat-r%revision%.vsix\r
 ninja package || exit /b\r
 cd ..\r
 \r
-REM The plug-in is built separately as it uses a statically linked clang-cl.exe.\r
+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
 set CC=..\build32_stage0\bin\clang-cl\r
@@ -89,7 +89,7 @@ copy ..\llvm\tools\clang\tools\clang-format-vs\ClangFormat\bin\Release\ClangForm
 cd ..\r
 \r
 \r
-call "%vcdir%/vcvarsall.bat" amd64\r
+call "%vsdevcmd%" -arch=amd64\r
 set CC=\r
 set CXX=\r
 mkdir build64_stage0\r