Commit e68b8161 authored by Hans Wennborg's avatar Hans Wennborg
Browse files

Update build_llvm_package.bat to build from the monorepo

parent 98189755

llvm/utils/release/build_llvm_package.bat

+26 −30
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ REM Usage: build_llvm_package.bat <revision> 


REM Prerequisites:

REM

REM   Visual Studio 2019, CMake, Ninja, SVN, GNUWin32, SWIG, Python 3,

REM   Visual Studio 2019, CMake, Ninja, GNUWin32, SWIG, Python 3,

REM   NSIS with the strlen_8192 patch,

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

REM   Perl (for the OpenMP run-time).
@@ -24,13 +24,13 @@ set vsdevcmd=C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\Co 
set python32_dir=C:\Users\%USERNAME%\AppData\Local\Programs\Python\Python36-32

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



for /f "usebackq" %%i in (`PowerShell ^(Get-Date^).ToString^('yyyyMMdd'^)`) do set datestamp=%%i



set revision=%1

set branch=trunk

set package_version=10.0.0-r%revision%

set clang_format_vs_version=10.0.0.%revision%

set package_version=10.0.0-%revision%

set clang_format_vs_version=10.0.0.%datestamp%

set build_dir=llvm_package_%revision%



echo Branch: %branch%

echo Revision: %revision%

echo Package version: %package_version%

echo Clang format plugin version: %clang_format_vs_version%
@@ -41,15 +41,10 @@ pause 
mkdir %build_dir%

cd %build_dir%



echo Checking out %branch% at r%revision%...

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

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

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

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



echo Checking out %revision%

curl -L https://github.com/llvm/llvm-project/archive/%revision%.zip -o src.zip || exit /b

7z x src.zip || exit /b

mv llvm-project-* llvm-project || exit /b



REM Setting CMAKE_CL_SHOWINCLUDES_PREFIX to work around PR27226.

set cmake_flags=^
@@ -62,7 +57,8 @@ set cmake_flags=^ 
  -DPACKAGE_VERSION=%package_version% ^

  -DLLDB_RELOCATABLE_PYTHON=1 ^

  -DLLDB_TEST_COMPILER=%cd%\build32_stage0\bin\clang.exe ^

	-DCMAKE_CL_SHOWINCLUDES_PREFIX="Note: including file: "

  -DCMAKE_CL_SHOWINCLUDES_PREFIX="Note: including file: " ^

  -DLLVM_ENABLE_PROJECTS="clang;clang-tools-extra;lld;compiler-rt;openmp;lldb"



REM TODO: Run the "check-all" tests.
@@ -72,7 +68,7 @@ set CC= 
set CXX=

mkdir build32_stage0

cd build32_stage0

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

cmake -GNinja %cmake_flags% -DPYTHON_HOME=%python32_dir% -DPYTHON_EXECUTABLE=%python32_dir%\python.exe ..\llvm-project\llvm || exit /b

ninja all || ninja all || ninja all || exit /b

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

ninja check-clang || ninja check-clang || ninja check-clang || exit /b
@@ -86,7 +82,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% -DPYTHON_EXECUTABLE=%python32_dir%\python.exe ..\llvm || exit /b

cmake -GNinja %cmake_flags% -DPYTHON_HOME=%python32_dir% -DPYTHON_EXECUTABLE=%python32_dir%\python.exe ..\llvm-project\llvm || exit /b

ninja all || ninja all || ninja all || exit /b

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

ninja check-clang || ninja check-clang || ninja check-clang || exit /b
@@ -104,9 +100,9 @@ REM Having VSSDKINSTALL set makes devenv *not* find the SDK for some reason. 
set VSSDKINSTALL=

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% -DPYTHON_EXECUTABLE=%python32_dir%\python.exe ..\llvm || exit /b

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-project\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

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

cd ..
@@ -116,7 +112,7 @@ set CC= 
set CXX=

mkdir build64_stage0

cd build64_stage0

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

cmake -GNinja %cmake_flags% -DPYTHON_HOME=%python64_dir% -DPYTHON_EXECUTABLE=%python64_dir%\python.exe ..\llvm-project\llvm || exit /b

ninja all || ninja all || ninja all || exit /b

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

ninja check-clang || ninja check-clang || ninja check-clang || exit /b
@@ -130,7 +126,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% -DPYTHON_EXECUTABLE=%python64_dir%\python.exe ..\llvm || exit /b

cmake -GNinja %cmake_flags% -DPYTHON_HOME=%python64_dir% -DPYTHON_EXECUTABLE=%python64_dir%\python.exe ..\llvm-project\llvm || exit /b

ninja all || ninja all || ninja all || exit /b

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

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