build_llvm_package.bat: Drop LLDB from the package.

I don't think anyone ever got this to work, what with getting exactly
the right Python dependency and so on. Removing it simplifies the
script, removes a number of hairy dependencies, and cuts ~30 MB off the
installer size.

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

1 files changed, 7 insertions, 15 deletions

diff --git a/utils/release/build_llvm_package.bat b/utils/release/build_llvm_package.bat
index 4842dd400f2..d19328c5ac0 100755
--- a/utils/release/build_llvm_package.bat
+++ b/utils/release/build_llvm_package.bat
@@ -8,22 +8,15 @@ REM Usage: build_llvm_package.bat <revision>
 

 REM Prerequisites:

 REM

-REM   Visual Studio 2017, CMake, Ninja, SVN, GNUWin32, SWIG, Python 3,

+REM   Visual Studio 2017, CMake, Ninja, SVN, GNUWin32, 

 REM   NSIS with the strlen_8192 patch,

 REM   Visual Studio 2017 SDK and Nuget (for the clang-format plugin),

 REM   Perl (for the OpenMP run-time).

-REM

-REM

-REM   For LLDB, SWIG version <= 3.0.8 needs to be used to work around

-REM   https://github.com/swig/swig/issues/769

 

 

 REM You need to modify the paths below:

 set vsdevcmd=C:\Program Files (x86)\Microsoft Visual Studio\2017\Professional\Common7\Tools\VsDevCmd.bat

 

-set python32_dir=C:\Users\%USERNAME%\AppData\Local\Programs\Python\Python36-32

-set python64_dir=C:\Users\%USERNAME%\AppData\Local\Programs\Python\Python36

-

 set revision=%1

 set branch=trunk

 set package_version=7.0.0-r%revision%

@@ -48,11 +41,10 @@ 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

 REM 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 -DCMAKE_INSTALL_UCRT_LIBRARIES=ON -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: "

+set cmake_flags=-DCMAKE_BUILD_TYPE=Release -DLLVM_ENABLE_ASSERTIONS=ON -DLLVM_USE_CRT_RELEASE=MT -DLLVM_INSTALL_TOOLCHAIN_ONLY=ON -DCLANG_FORMAT_VS_VERSION=%clang_format_vs_version% -DPACKAGE_VERSION=%package_version% -DCMAKE_CL_SHOWINCLUDES_PREFIX="Note: including file: "

 

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

 

@@ -63,7 +55,7 @@ set CXX=
 mkdir build32_stage0

 cd build32_stage0

 REM Work around VS2017 bug by using MinSizeRel.

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

+cmake -GNinja %cmake_flags% -DCMAKE_BUILD_TYPE=MinSizeRel ..\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

@@ -73,7 +65,7 @@ mkdir build32
 cd build32

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

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

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

+cmake -GNinja %cmake_flags% ..\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

@@ -85,7 +77,7 @@ mkdir build_vsix
 cd build_vsix

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

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

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

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

 ninja clang_format_vsix || exit /b

 copy ..\llvm\tools\clang\tools\clang-format-vs\ClangFormat\bin\Release\ClangFormat.vsix ClangFormat-r%revision%.vsix

 cd ..

@@ -98,7 +90,7 @@ set CXX=
 mkdir build64_stage0

 cd build64_stage0

 REM Work around VS2017 bug by using MinSizeRel.

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

+cmake -GNinja %cmake_flags% -DCMAKE_BUILD_TYPE=MinSizeRel ..\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

@@ -108,7 +100,7 @@ mkdir build64
 cd build64

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

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

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

+cmake -GNinja %cmake_flags% ..\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