Support of Boost 1.83.0 in boost-msvc-2022 image (VS 2022, 17.10.x, boostorg/boost#914).

Author: mabrarov

docker/boost-msvc-2022/src/app/bootstrap.bat

@@ -8,6 +8,22 @@ rem
 
 set exit_code=0
 
+if not "--%BOOST_PATCH_FILE%" == "--" (
+  set "DEFAULT_PATH=%PATH%"
+  set "PATH=%MSYS_HOME%\usr\bin;%PATH%"
+
+  patch -uNf -p0 -i "%BOOST_PATCH_FILE%"
+  set exit_code=%errorlevel%
+  if %exit_code% neq 0 (
+    if %exit_code% neq 1 goto exit
+  )
+
+  rem Reset errorlevel to zero
+  cmd /c "exit /b 0"
+
+  set "PATH=%DEFAULT_PATH%"
+)
+
 call "%MSVC_BUILD_DIR%\%MSVC_CMD_BOOTSTRAP%"
 set exit_code=%errorlevel%
 if %exit_code% neq 0 goto exit

docker/boost-msvc-2022/src/app/patches/boost-1.83.0.patch

@@ -0,0 +1,28 @@
+--- ./tools/build/src/tools/msvc.jam	2024-10-26 21:25:07.777160300 +0300
++++ ./tools/build/src/tools/msvc.jam	2024-10-26 21:25:07.777160300 +0300
+@@ -23,6 +23,7 @@
+ tools on Microsoft Windows. The supported products and versions of
+ command line tools are listed below:
+ 
++* Visual Studio 2022-14.3
+ * Visual Studio 2019-14.2
+ * Visual Studio 2017—14.1
+ * Visual Studio 2015—14.0
+@@ -1137,7 +1138,7 @@
+         }
+         else
+         {
+-            if [ MATCH "(14.3)" : $(version) ]
++            if [ MATCH "(14.[34])" : $(version) ]
+             {
+                 if $(.debug-configuration)
+                 {
+@@ -1316,7 +1317,7 @@
+             # version from the path.
+             # FIXME: We currently detect both Microsoft Visual Studio 9.0 and
+             # 9.0express as 9.0 here.
+-            if [ MATCH "(MSVC\\\\14.3)" : $(command) ]
++            if [ MATCH "(MSVC\\\\14.[34])" : $(command) ]
+             {
+                 version = 14.3 ;
+             }

docker/boost-msvc-2022/src/app/start.ps1

@@ -42,7 +42,16 @@ if (Test-Path -Path "${env:BOOST_ROOT_DIR}") {
 }
 
 $env:B2_BIN = "${env:BOOST_ROOT_DIR}\b2.exe"
-$env:B2_TOOLSET = "msvc-14.3"
+$env:B2_TOOLSET = "msvc-14.4"
+
+# Prepare patch for Boost
+if (-not (Test-Path env:BOOST_PATCH_FILE)) {
+  $env:BOOST_PATCH_FILE = "${PSScriptRoot}\patches\boost-${env:BOOST_VERSION}.patch"
+}
+if (-not (Test-Path -Path "${env:BOOST_PATCH_FILE}")) {
+  Write-Warning "Patch for chosen version of Boost (${env:BOOST_VERSION}) was not found at ${env:BOOST_PATCH_FILE}"
+  $env:BOOST_PATCH_FILE = ""
+}
 
 # Build Boost.Build
 $env:MSVC_CMD_BOOTSTRAP = "vcvars64.bat"