build_llvm_package.bat: Update to VS2015 and include LLDB

llvm-svn: 281676

diff --git a/llvm/utils/release/build_llvm_package.bat b/llvm/utils/release/build_llvm_package.bat
index 3b032dd..aace43c 100755 (executable)
--- a/llvm/utils/release/build_llvm_package.bat
+++ b/llvm/utils/release/build_llvm_package.bat
@@ -8,13 +8,15 @@ REM Usage: build_llvm_package.bat <revision>
 \r
 REM Prerequisites:\r
 REM\r
-REM   Visual Studio 2013, CMake, Ninja, SVN, GNUWin32,\r
+REM   Visual Studio 2015, CMake, Ninja, SVN, GNUWin32, SWIG, Python 3,\r
 REM   NSIS with the strlen_8192 patch,\r
-REM   Visual Studio 2013 SDK (for the clang-format plugin).\r
+REM   Visual Studio 2015 SDK (for the clang-format plugin).\r
 \r
 \r
-REM You may need to modify the paths below:\r
-set vcdir=c:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\r
+REM You need to modify the paths below:\r
+set vcdir=c:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\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
 \r
 set revision=%1\r
@@ -41,10 +43,11 @@ svn.exe export -r %revision% http://llvm.org/svn/llvm-project/clang-tools-extra/
 svn.exe export -r %revision% http://llvm.org/svn/llvm-project/lld/%branch% llvm/tools/lld || exit /b\r
 svn.exe export -r %revision% http://llvm.org/svn/llvm-project/compiler-rt/%branch% llvm/projects/compiler-rt || exit /b\r
 svn.exe export -r %revision% http://llvm.org/svn/llvm-project/openmp/%branch% llvm/projects/openmp || exit /b\r
+svn.exe export -r %revision% http://llvm.org/svn/llvm-project/lldb/%branch% llvm/tools/lldb || exit /b\r
 \r
 \r
 REM Setting CMAKE_CL_SHOWINCLUDES_PREFIX to work around PR27226.\r
-set cmake_flags=-DCMAKE_BUILD_TYPE=Release -DLLVM_ENABLE_ASSERTIONS=ON -DLLVM_INSTALL_TOOLCHAIN_ONLY=ON -DLLVM_USE_CRT_RELEASE=MT -DCLANG_FORMAT_VS_VERSION=%clang_format_vs_version% -DPACKAGE_VERSION=%package_version% -DCMAKE_CL_SHOWINCLUDES_PREFIX="Note: including file: "\r
+set cmake_flags=-DCMAKE_BUILD_TYPE=Release -DLLVM_ENABLE_ASSERTIONS=ON -DLLVM_INSTALL_TOOLCHAIN_ONLY=ON -DLLVM_USE_CRT_RELEASE=MT -DCLANG_FORMAT_VS_VERSION=%clang_format_vs_version% -DPACKAGE_VERSION=%package_version% -DLLDB_RELOCATABLE_PYTHON=1 -DLLDB_TEST_COMPILER=%cd%\build32_stage0\bin\clang.exe -DCMAKE_CL_SHOWINCLUDES_PREFIX="Note: including file: "\r
 \r
 REM TODO: Run all tests, including lld and compiler-rt.\r
 \r
@@ -53,7 +56,7 @@ set CC=
 set CXX=\r
 mkdir build32_stage0\r
 cd build32_stage0\r
-cmake -GNinja %cmake_flags% ..\llvm || exit /b\r
+cmake -GNinja %cmake_flags% -DPYTHON_HOME=%python32_dir% ..\llvm || exit /b\r
 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
@@ -63,7 +66,7 @@ mkdir build32
 cd build32\r
 set CC=..\build32_stage0\bin\clang-cl\r
 set CXX=..\build32_stage0\bin\clang-cl\r
-cmake -GNinja %cmake_flags% -DBUILD_CLANG_FORMAT_VS_PLUGIN=ON ..\llvm || exit /b\r
+cmake -GNinja %cmake_flags% -DBUILD_CLANG_FORMAT_VS_PLUGIN=ON -DPYTHON_HOME=%python32_dir% ..\llvm || exit /b\r
 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
@@ -77,7 +80,7 @@ set CC=
 set CXX=\r
 mkdir build64_stage0\r
 cd build64_stage0\r
-cmake -GNinja %cmake_flags%  ..\llvm || exit /b\r
+cmake -GNinja %cmake_flags% -DPYTHON_HOME=%python64_dir% ..\llvm || exit /b\r
 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
@@ -87,7 +90,7 @@ mkdir build64
 cd build64\r
 set CC=..\build64_stage0\bin\clang-cl\r
 set CXX=..\build64_stage0\bin\clang-cl\r
-cmake -GNinja %cmake_flags% ..\llvm || exit /b\r
+cmake -GNinja %cmake_flags% -DPYTHON_HOME=%python64_dir% ..\llvm || exit /b\r
 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