build_llvm_package.bat: Update to VS2015 and include LLDB

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

1 files changed, 12 insertions, 9 deletions

diff --git a/utils/release/build_llvm_package.bat b/utils/release/build_llvm_package.bat
index 3b032dd2823..aace43c592e 100755
--- a/utils/release/build_llvm_package.bat
+++ b/utils/release/build_llvm_package.bat
@@ -8,13 +8,15 @@ REM Usage: build_llvm_package.bat <revision>
 

 REM Prerequisites:

 REM

-REM   Visual Studio 2013, CMake, Ninja, SVN, GNUWin32,

+REM   Visual Studio 2015, CMake, Ninja, SVN, GNUWin32, SWIG, Python 3,

 REM   NSIS with the strlen_8192 patch,

-REM   Visual Studio 2013 SDK (for the clang-format plugin).

+REM   Visual Studio 2015 SDK (for the clang-format plugin).

 

 

-REM You may need to modify the paths below:

-set vcdir=c:\Program Files (x86)\Microsoft Visual Studio 12.0\VC

+REM You need to modify the paths below:

+set vcdir=c:\Program Files (x86)\Microsoft Visual Studio 14.0\VC

+set python32_dir=C:\Users\hwennborg\AppData\Local\Programs\Python\Python35-32

+set python64_dir=C:\Users\hwennborg\AppData\Local\Programs\Python\Python35

 set PATH=%PATH%;c:\gnuwin32\bin

 

 set revision=%1

@@ -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

 svn.exe export -r %revision% http://llvm.org/svn/llvm-project/compiler-rt/%branch% llvm/projects/compiler-rt || exit /b

 svn.exe export -r %revision% http://llvm.org/svn/llvm-project/openmp/%branch% llvm/projects/openmp || exit /b

+svn.exe export -r %revision% http://llvm.org/svn/llvm-project/lldb/%branch% llvm/tools/lldb || exit /b

 

 

 REM Setting CMAKE_CL_SHOWINCLUDES_PREFIX to work around PR27226.

-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: "

+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: "

 

 REM TODO: Run all tests, including lld and compiler-rt.

 

@@ -53,7 +56,7 @@ set CC=
 set CXX=

 mkdir build32_stage0

 cd build32_stage0

-cmake -GNinja %cmake_flags% ..\llvm || exit /b

+cmake -GNinja %cmake_flags% -DPYTHON_HOME=%python32_dir% ..\llvm || exit /b

 ninja all || exit /b

 ninja check || ninja check || ninja check || exit /b

 ninja check-clang || ninja check-clang || ninja check-clang ||  exit /b

@@ -63,7 +66,7 @@ mkdir build32
 cd build32

 set CC=..\build32_stage0\bin\clang-cl

 set CXX=..\build32_stage0\bin\clang-cl

-cmake -GNinja %cmake_flags% -DBUILD_CLANG_FORMAT_VS_PLUGIN=ON ..\llvm || exit /b

+cmake -GNinja %cmake_flags% -DBUILD_CLANG_FORMAT_VS_PLUGIN=ON -DPYTHON_HOME=%python32_dir% ..\llvm || exit /b

 ninja all || exit /b

 ninja check || ninja check || ninja check || exit /b

 ninja check-clang || ninja check-clang || ninja check-clang ||  exit /b

@@ -77,7 +80,7 @@ set CC=
 set CXX=

 mkdir build64_stage0

 cd build64_stage0

-cmake -GNinja %cmake_flags%  ..\llvm || exit /b

+cmake -GNinja %cmake_flags% -DPYTHON_HOME=%python64_dir% ..\llvm || exit /b

 ninja all || exit /b

 ninja check || ninja check || ninja check || exit /b

 ninja check-clang || ninja check-clang || ninja check-clang ||  exit /b

@@ -87,7 +90,7 @@ mkdir build64
 cd build64

 set CC=..\build64_stage0\bin\clang-cl

 set CXX=..\build64_stage0\bin\clang-cl

-cmake -GNinja %cmake_flags% ..\llvm || exit /b

+cmake -GNinja %cmake_flags% -DPYTHON_HOME=%python64_dir% ..\llvm || exit /b

 ninja all || exit /b

 ninja check || ninja check || ninja check || exit /b

 ninja check-clang || ninja check-clang || ninja check-clang ||  exit /b