From 31fa4ef033a3c7961a11e9edc4bda8c2b2152f96 Mon Sep 17 00:00:00 2001 From: "Alexander A. Klimov" Date: Mon, 5 Jul 2021 18:25:42 +0200 Subject: [PATCH] Bump Boost to v1.76 --- doc/21-development.md | 32 ++++++++++++++++---------------- doc/win-dev.ps1 | 2 +- tools/win32/configure-dev.ps1 | 4 ++-- tools/win32/configure.ps1 | 4 ++-- 4 files changed, 21 insertions(+), 21 deletions(-) diff --git a/doc/21-development.md b/doc/21-development.md index 8fd877c9e..2ae7f398b 100644 --- a/doc/21-development.md +++ b/doc/21-development.md @@ -477,18 +477,18 @@ File Type: EXECUTABLE IMAGE Image has the following dependencies: - boost_coroutine-vc142-mt-gd-x64-1_71.dll - boost_date_time-vc142-mt-gd-x64-1_71.dll - boost_filesystem-vc142-mt-gd-x64-1_71.dll - boost_thread-vc142-mt-gd-x64-1_71.dll - boost_regex-vc142-mt-gd-x64-1_71.dll + boost_coroutine-vc142-mt-gd-x64-1_76.dll + boost_date_time-vc142-mt-gd-x64-1_76.dll + boost_filesystem-vc142-mt-gd-x64-1_76.dll + boost_thread-vc142-mt-gd-x64-1_76.dll + boost_regex-vc142-mt-gd-x64-1_76.dll libssl-1_1-x64.dll libcrypto-1_1-x64.dll WS2_32.dll dbghelp.dll SHLWAPI.dll msi.dll - boost_unit_test_framework-vc142-mt-gd-x64-1_71.dll + boost_unit_test_framework-vc142-mt-gd-x64-1_76.dll KERNEL32.dll SHELL32.dll ADVAPI32.dll @@ -1763,7 +1763,7 @@ mkdir build cd .\build\ & "C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\Common7\IDE\CommonExtensions\Microsoft\CMake\CMake\bin\cmake.exe" ` - -DBoost_INCLUDE_DIR=C:\local\boost_1_71_0-Win64 ` + -DBoost_INCLUDE_DIR=C:\local\boost_1_76_0-Win64 ` -DBISON_EXECUTABLE=C:\ProgramData\chocolatey\lib\winflexbison3\tools\win_bison.exe ` -DFLEX_EXECUTABLE=C:\ProgramData\chocolatey\lib\winflexbison3\tools\win_flex.exe ` -DICINGA2_WITH_MYSQL=OFF -DICINGA2_WITH_PGSQL=OFF .. @@ -1936,16 +1936,16 @@ Download the [boost-binaries](https://sourceforge.net/projects/boost/files/boost - 64 for 64 bit builds ``` -https://sourceforge.net/projects/boost/files/boost-binaries/1.71.0/boost_1_71_0-msvc-14.2-64.exe/download +https://sourceforge.net/projects/boost/files/boost-binaries/1.76.0/boost_1_76_0-msvc-14.2-64.exe/download ``` -Run the installer and leave the default installation path in `C:\local\boost_1_71_0`. +Run the installer and leave the default installation path in `C:\local\boost_1_76_0`. ##### Source & Compile In order to use the boost development header and library files you need to [download](https://www.boost.org/users/download/) -Boost and then extract it to e.g. `C:\local\boost_1_71_0`. +Boost and then extract it to e.g. `C:\local\boost_1_76_0`. > **Note** > @@ -1953,12 +1953,12 @@ Boost and then extract it to e.g. `C:\local\boost_1_71_0`. > the archive contains more than 70k files. In order to integrate Boost into Visual Studio, open the `Developer Command Prompt` from the start menu, -and navigate to `C:\local\boost_1_71_0`. +and navigate to `C:\local\boost_1_76_0`. Execute `bootstrap.bat` first. ``` -cd C:\local\boost_1_71_0 +cd C:\local\boost_1_76_0 bootstrap.bat ``` @@ -2041,8 +2041,8 @@ You need to specify the previously installed component paths. Variable | Value | Description ----------------------|----------------------------------------------------------------------|------------------------------------------------------- -`BOOST_ROOT` | `C:\local\boost_1_71_0` | Root path where you've extracted and compiled Boost. -`BOOST_LIBRARYDIR` | Binary: `C:\local\boost_1_71_0\lib64-msvc-14.2`, Source: `C:\local\boost_1_71_0\stage` | Path to the static compiled Boost libraries, directory must contain `lib`. +`BOOST_ROOT` | `C:\local\boost_1_76_0` | Root path where you've extracted and compiled Boost. +`BOOST_LIBRARYDIR` | Binary: `C:\local\boost_1_76_0\lib64-msvc-14.2`, Source: `C:\local\boost_1_76_0\stage` | Path to the static compiled Boost libraries, directory must contain `lib`. `BISON_EXECUTABLE` | `C:\ProgramData\chocolatey\lib\winflexbison\tools\win_bison.exe` | Path to the Bison executable. `FLEX_EXECUTABLE` | `C:\ProgramData\chocolatey\lib\winflexbison\tools\win_flex.exe` | Path to the Flex executable. `ICINGA2_WITH_MYSQL` | OFF | Requires extra setup for MySQL if set to `ON`. Not supported for client setups. @@ -2079,8 +2079,8 @@ $env:ICINGA2_INSTALLPATH = 'C:\Program Files\Icinga2-debug' $env:ICINGA2_BUILDPATH='debug' $env:CMAKE_BUILD_TYPE='Debug' $env:OPENSSL_ROOT_DIR='C:\OpenSSL-Win64' -$env:BOOST_ROOT='C:\local\boost_1_71_0' -$env:BOOST_LIBRARYDIR='C:\local\boost_1_71_0\lib64-msvc-14.2' +$env:BOOST_ROOT='C:\local\boost_1_76_0' +$env:BOOST_LIBRARYDIR='C:\local\boost_1_76_0\lib64-msvc-14.2' ``` #### Icinga 2 in Visual Studio diff --git a/doc/win-dev.ps1 b/doc/win-dev.ps1 index 42a48d4f8..dc02e1ce4 100644 --- a/doc/win-dev.ps1 +++ b/doc/win-dev.ps1 @@ -13,7 +13,7 @@ function ThrowOnNativeFailure { $VsVersion = 2019 $MsvcVersion = '14.2' -$BoostVersion = @(1, 71, 0) +$BoostVersion = @(1, 76, 0) $OpensslVersion = '1_1_1h' switch ($Env:BITS) { diff --git a/tools/win32/configure-dev.ps1 b/tools/win32/configure-dev.ps1 index c905ca9a0..a30189dae 100644 --- a/tools/win32/configure-dev.ps1 +++ b/tools/win32/configure-dev.ps1 @@ -31,10 +31,10 @@ if (-not (Test-Path env:OPENSSL_ROOT_DIR)) { $env:OPENSSL_ROOT_DIR = 'c:\local\OpenSSL-Win64' } if (-not (Test-Path env:BOOST_ROOT)) { - $env:BOOST_ROOT = 'c:\local\boost_1_71_0' + $env:BOOST_ROOT = 'c:\local\boost_1_76_0' } if (-not (Test-Path env:BOOST_LIBRARYDIR)) { - $env:BOOST_LIBRARYDIR = 'c:\local\boost_1_71_0\lib64-msvc-14.2' + $env:BOOST_LIBRARYDIR = 'c:\local\boost_1_76_0\lib64-msvc-14.2' } if (-not (Test-Path env:FLEX_BINARY)) { $env:FLEX_BINARY = 'C:\ProgramData\chocolatey\bin\win_flex.exe' diff --git a/tools/win32/configure.ps1 b/tools/win32/configure.ps1 index 7afd922ae..2cd675f53 100644 --- a/tools/win32/configure.ps1 +++ b/tools/win32/configure.ps1 @@ -26,10 +26,10 @@ if (-not (Test-Path env:OPENSSL_ROOT_DIR)) { $env:OPENSSL_ROOT_DIR = 'c:\local\OpenSSL_1_1_1h-Win64' } if (-not (Test-Path env:BOOST_ROOT)) { - $env:BOOST_ROOT = 'c:\local\boost_1_71_0-Win64' + $env:BOOST_ROOT = 'c:\local\boost_1_76_0-Win64' } if (-not (Test-Path env:BOOST_LIBRARYDIR)) { - $env:BOOST_LIBRARYDIR = 'c:\local\boost_1_71_0-Win64\lib64-msvc-14.2' + $env:BOOST_LIBRARYDIR = 'c:\local\boost_1_76_0-Win64\lib64-msvc-14.2' } if (-not (Test-Path env:FLEX_BINARY)) { $env:FLEX_BINARY = 'C:\ProgramData\chocolatey\bin\win_flex.exe'