From 561d6a3981a4548e9020fae5c04ec0b3bc26f2ab Mon Sep 17 00:00:00 2001 From: "Alexander A. Klimov" Date: Fri, 7 Jun 2024 16:02:07 +0200 Subject: [PATCH] Bump Boost shipped for Windows to v1.85 Note: For doc/21-development.md use: perl -pi -e 's/(boost[-\w]*?1[-_]?)84/${1}85/g' doc/21-development.md --- 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 10cf765fc..27387f235 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_84.dll - boost_date_time-vc142-mt-gd-x64-1_84.dll - boost_filesystem-vc142-mt-gd-x64-1_84.dll - boost_thread-vc142-mt-gd-x64-1_84.dll - boost_regex-vc142-mt-gd-x64-1_84.dll + boost_coroutine-vc142-mt-gd-x64-1_85.dll + boost_date_time-vc142-mt-gd-x64-1_85.dll + boost_filesystem-vc142-mt-gd-x64-1_85.dll + boost_thread-vc142-mt-gd-x64-1_85.dll + boost_regex-vc142-mt-gd-x64-1_85.dll libssl-3_0-x64.dll libcrypto-3_0-x64.dll WS2_32.dll dbghelp.dll SHLWAPI.dll msi.dll - boost_unit_test_framework-vc142-mt-gd-x64-1_84.dll + boost_unit_test_framework-vc142-mt-gd-x64-1_85.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" ` - -DICINGA2_UNITY_BUILD=OFF -DBoost_INCLUDE_DIR=C:\local\boost_1_84_0-Win64 ` + -DICINGA2_UNITY_BUILD=OFF -DBoost_INCLUDE_DIR=C:\local\boost_1_85_0-Win64 ` -DBISON_EXECUTABLE=C:\ProgramData\chocolatey\lib\winflexbison3\tools\win_bison.exe ` -DFLEX_EXECUTABLE=C:\ProgramData\chocolatey\lib\winflexbison3\tools\win_flex.exe .. @@ -1935,16 +1935,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.82.0/boost_1_84_0-msvc-14.2-64.exe/download +https://sourceforge.net/projects/boost/files/boost-binaries/1.82.0/boost_1_85_0-msvc-14.2-64.exe/download ``` -Run the installer and leave the default installation path in `C:\local\boost_1_84_0`. +Run the installer and leave the default installation path in `C:\local\boost_1_85_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_84_0`. +Boost and then extract it to e.g. `C:\local\boost_1_85_0`. > **Note** > @@ -1952,12 +1952,12 @@ Boost and then extract it to e.g. `C:\local\boost_1_84_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_84_0`. +and navigate to `C:\local\boost_1_85_0`. Execute `bootstrap.bat` first. ``` -cd C:\local\boost_1_84_0 +cd C:\local\boost_1_85_0 bootstrap.bat ``` @@ -2040,8 +2040,8 @@ You need to specify the previously installed component paths. Variable | Value | Description ----------------------|----------------------------------------------------------------------|------------------------------------------------------- -`BOOST_ROOT` | `C:\local\boost_1_84_0` | Root path where you've extracted and compiled Boost. -`BOOST_LIBRARYDIR` | Binary: `C:\local\boost_1_84_0\lib64-msvc-14.2`, Source: `C:\local\boost_1_84_0\stage` | Path to the static compiled Boost libraries, directory must contain `lib`. +`BOOST_ROOT` | `C:\local\boost_1_85_0` | Root path where you've extracted and compiled Boost. +`BOOST_LIBRARYDIR` | Binary: `C:\local\boost_1_85_0\lib64-msvc-14.2`, Source: `C:\local\boost_1_85_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_UNITY_BUILD` | OFF | Disable unity builds for development environments. @@ -2076,8 +2076,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_84_0' -$env:BOOST_LIBRARYDIR='C:\local\boost_1_84_0\lib64-msvc-14.2' +$env:BOOST_ROOT='C:\local\boost_1_85_0' +$env:BOOST_LIBRARYDIR='C:\local\boost_1_85_0\lib64-msvc-14.2' ``` #### Icinga 2 in Visual Studio diff --git a/doc/win-dev.ps1 b/doc/win-dev.ps1 index 80779288b..5db5b7259 100644 --- a/doc/win-dev.ps1 +++ b/doc/win-dev.ps1 @@ -13,7 +13,7 @@ function ThrowOnNativeFailure { $VsVersion = 2019 $MsvcVersion = '14.2' -$BoostVersion = @(1, 84, 0) +$BoostVersion = @(1, 85, 0) $OpensslVersion = '3_0_12' switch ($Env:BITS) { diff --git a/tools/win32/configure-dev.ps1 b/tools/win32/configure-dev.ps1 index 6fc12b30b..40b381e42 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_84_0' + $env:BOOST_ROOT = 'c:\local\boost_1_85_0' } if (-not (Test-Path env:BOOST_LIBRARYDIR)) { - $env:BOOST_LIBRARYDIR = 'c:\local\boost_1_84_0\lib64-msvc-14.2' + $env:BOOST_LIBRARYDIR = 'c:\local\boost_1_85_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 55f0a5875..804795151 100644 --- a/tools/win32/configure.ps1 +++ b/tools/win32/configure.ps1 @@ -33,10 +33,10 @@ if (-not (Test-Path env:OPENSSL_ROOT_DIR)) { $env:OPENSSL_ROOT_DIR = "c:\local\OpenSSL_3_0_12-Win${env:BITS}" } if (-not (Test-Path env:BOOST_ROOT)) { - $env:BOOST_ROOT = "c:\local\boost_1_84_0-Win${env:BITS}" + $env:BOOST_ROOT = "c:\local\boost_1_85_0-Win${env:BITS}" } if (-not (Test-Path env:BOOST_LIBRARYDIR)) { - $env:BOOST_LIBRARYDIR = "c:\local\boost_1_84_0-Win${env:BITS}\lib${env:BITS}-msvc-14.2" + $env:BOOST_LIBRARYDIR = "c:\local\boost_1_85_0-Win${env:BITS}\lib${env:BITS}-msvc-14.2" } if (-not (Test-Path env:FLEX_BINARY)) { $env:FLEX_BINARY = 'C:\ProgramData\chocolatey\bin\win_flex.exe'