Merge branch 'master' into wip/tom

Author: Tom Seddon

Makefile.windows.mak

@@ -4,9 +4,13 @@ SHELL:=$(windir)\system32\cmd.exe
 ##########################################################################
 ##########################################################################
 
+.PHONY:init_vs2022
+init_vs2022:
+	$(MAKE) _newer_vs VSYEAR=2022 VSVER=17 VSVERNAME="Visual Studio 17 2022"
+
 .PHONY:init_vs2019
 init_vs2019:
-	$(MAKE) _newer_vs VSYEAR=2019 VSVER=16
+	$(MAKE) _newer_vs VSYEAR=2019 VSVER=16 VSVERNAME="Visual Studio 16"
 
 ##########################################################################
 ##########################################################################
@@ -18,12 +22,17 @@ _newer_vs: FOLDER=$(BUILD_FOLDER)/$(FOLDER_PREFIX)vs$(VSYEAR)
 _newer_vs:
 	$(if $(VS_PATH),,$(error Visual Studio $(VSYEAR) installation not found))
 	cmd /c bin\recreate_folder.bat $(FOLDER)
-	cd "$(FOLDER)" && "$(CMAKE)" $(CMAKE_DEFINES) -G "$(strip Visual Studio $(VSVER))" -A x64 ../..
+	cd "$(FOLDER)" && "..\..\bin\msbuild_bug_wrapper.bat" "$(CMAKE)" $(CMAKE_DEFINES) -G "$(VSVERNAME)" -A x64 ../..
 	$(SHELLCMD) copy-file etc\b2.ChildProcessDbgSettings "$(FOLDER)"
 
 ##########################################################################
 ##########################################################################
 
+.PHONY: run_tests_vs2022
+run_tests_vs2022: CONFIG=$(error Must specify CONFIG)
+run_tests_vs2022:
+	$(MAKE) _run_tests VSYEAR=2022 VSVER=17 CONFIG=$(CONFIG)
+
 .PHONY: run_tests_vs2019
 run_tests_vs2019: CONFIG=$(error Must specify CONFIG)
 run_tests_vs2019:

bin/msbuild_bug_wrapper.bat

@@ -0,0 +1,17 @@
+@echo off
+
+setlocal
+
+REM workaround for https://github.com/dotnet/msbuild/issues/5726
+REM
+REM This is not really a proper solution. It looks like any variable could
+REM cause, so, really, the entire environment needs fixing up. But it seems
+REM GNU Make renames Path to PATH specifically, leaving everything else
+REM the same, so, fingers crossed, this'll cover it for b2 building
+REM purposes.
+
+set _MSBUILD_BUG_WRAPPER_TEMP=%PATH%
+set PATH=
+set Path=%_MSBUILD_BUG_WRAPPER_TEMP%
+set _MSBUILD_BUG_WRAPPER_TEMP=
+%*

doc/Building-on-Windows.md

@@ -2,7 +2,8 @@
 
 Prerequisites:
 
-- Visual Studio 2019 (ensure C++ CMake tools for Windows is included)
+- Visual Studio 2022 or Visual Studio 2019 (ensure C++ CMake tools
+  for Windows is included)
 - Python 3.x (the version that comes with Visual Studio 2019 is fine)
 
 Optional, but recommended:
@@ -13,16 +14,20 @@ Initial setup, for use after cloning or updating the repo:
 
 1. Open command prompt in working copy folder 
 
-2. Run `make init_vs2019` to generate a solution for Visual Studio
-   2019.
+2. Run `make init_vs2022` to generate a solution for Visual Studio
+   2022, or `make init_vs2019` to generate a solution for Visual
+   Studio 2019
 
    You should get a bunch of output - there may be the odd warning,
    but there should be no obvious errors, and it should finish with an
    exit code of 0
 
 General day-to-day build steps:
 
-1. Load solution into Visual Studio: `build\vs2019\b2.sln`
+1. Load solution into Visual Studio:
+
+   - `build\vs2019\b2.sln` if using VS2019
+   - `build\vs2022\b2.sln` if using VS2022
 
 2. Build
 
@@ -37,6 +42,8 @@ information and the initial build steps ensure everything is rebuilt.)
 - Because of the way cmake works, there are 50+ projects in the
   solution. Even though most are rarely used, they're still there
   cluttering the place up. You just have to put up with this
+  
+- support for Visual Studio 2019 will probably go away eventually...
 
 # Running the automated tests
 

etc/release/release.py

@@ -167,6 +167,7 @@ def get_win32_vs_path(options):
         fatal('Visual Studio not installed? vswhere.exe not found at: %s'%vswhere_path)
 
     if options.toolchain=='vs2019': ver=16
+    elif options.toolchain=='vs2022': ver=17
     else: fatal('unknown toolchain: %s'%options.toolchain)
 
     installation_path=subprocess.check_output([vswhere_path,'-version',str(ver),'-property','installationPath']).decode('utf-8').rstrip()
@@ -528,8 +529,7 @@ def timestamp(x): return datetime.datetime.strptime(x,"%Y%m%d-%H%M%S")
     parser.add_argument('--gh-release',action='store_true',help='''create GitHub release (or prerelease if not on master git branch) and upload artefacts''')
 
     if sys.platform=='win32':
-        # TODO: sort this out...
-        parser.set_defaults(toolchain='vs2019')
+        parser.add_argument('-t','--toolchain',default='vs2022',help='''Specify toolchain: vs2019, or vs2022. Default: %(default)s''')
 
     if sys.platform=='darwin':
         macos_deployment_target_help='''macOS deployment target. Default is whatever the Makefile defaults to'''