From 1ff6a2d0ae3a0a45278519ed39a08769329296d5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tam=C3=A1s=20B=C3=A1lint=20Misius?= <lbphacker@gmail.com>
Date: Sun, 3 Dec 2023 17:32:33 +0100
Subject: [PATCH] Add a --backend=vs job to the ghactions workflow

This also requires patching CREATEPROCESS_MANIFEST_RESOURCE_ID out of powder-res.template.rc because Meson generates a VS config that instructs VS to add its own and this conflicts with ours. TODO: Undo this hack once https://github.com/mesonbuild/meson/pull/12472 makes it into a release.

Also start using meson compile in place of ninja in some cases because it integrates better.
---
 .github/build.sh   | 29 ++++++++++++++++++++++++++---
 .github/prepare.py |  1 +
 2 files changed, 27 insertions(+), 3 deletions(-)

diff --git a/.github/build.sh b/.github/build.sh
index fd02a3568..1b59a439d 100755
--- a/.github/build.sh
+++ b/.github/build.sh
@@ -206,6 +206,26 @@ fi
 if [[ $PACKAGE_MODE == nolua ]]; then
 	meson_configure+=$'\t'-Dlua=none
 fi
+if [[ $PACKAGE_MODE == backendvs ]]; then
+	meson_configure+=$'\t'-Dbackend=vs
+	echo "NOTE: patching CREATEPROCESS_MANIFEST_RESOURCE_ID out of powder-res.template.rc"
+	echo "TODO: remove this patch once https://github.com/mesonbuild/meson/pull/12472 makes it into a release"
+	echo "TODO: also remove the relevant note from the building guide"
+	git apply <<PATCH
+diff --git a/resources/powder-res.template.rc b/resources/powder-res.template.rc
+index 1dc26c78..2094049f 100644
+--- a/resources/powder-res.template.rc
++++ b/resources/powder-res.template.rc
+@@ -7,7 +7,6 @@
+ 
+ IDI_ICON ICON DISCARDABLE "@ICON_EXE_ICO@"
+ IDI_DOC_ICON ICON DISCARDABLE "@ICON_CPS_ICO@"
+-CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "@WINUTF8_XML@"
+ 
+ VS_VERSION_INFO VERSIONINFO
+ FILEVERSION @DISPLAY_VERSION_MAJOR@,@DISPLAY_VERSION_MINOR@,0,@BUILD_NUM@
+PATCH
+fi
 if [[ $BSH_STATIC_DYNAMIC == static ]]; then
 	meson_configure+=$'\t'-Dstatic=prebuilt
 	if [[ $BSH_HOST_PLATFORM == windows ]]; then
@@ -401,9 +421,12 @@ if [[ $PACKAGE_MODE == appimage ]]; then
 	meson configure -Dcan_install=no -Dignore_updates=true -Dbuild_render=false -Dbuild_font=false
 	strip_target=$APP_EXE
 fi
-if [[ $BSH_BUILD_PLATFORM == windows ]]; then
+meson_compile=meson$'\t'compile
+meson_compile+=$'\t'-v
+if [[ $BSH_BUILD_PLATFORM == windows ]] && [[ $PACKAGE_MODE != backendvs ]]; then
 	set +e
-	ninja -v -d keeprsp
+	meson_compile+=$'\t'--ninja-args='["-d","keeprsp"]'
+	$meson_compile
 	ninja_code=$?
 	set -e
 	cat $APP_EXE.exe.rsp
@@ -417,7 +440,7 @@ if [[ $BSH_BUILD_PLATFORM == windows ]]; then
 		fi
 	fi
 else
-	ninja -v
+	$meson_compile
 fi
 
 if [[ $SEPARATE_DEBUG == yes ]] && [[ $BSH_HOST_PLATFORM-$BSH_HOST_LIBC != windows-msvc ]]; then
diff --git a/.github/prepare.py b/.github/prepare.py
index 53e9f2fd2..90ddcd010 100755
--- a/.github/prepare.py
+++ b/.github/prepare.py
@@ -103,6 +103,7 @@ for        arch,     platform,         libc,   statdyn, bplatform,         runso
 	(  'x86_64',    'windows',       'msvc',  'static', 'windows', 'windows-2019', '.exe',   False,    False,      None,         None,                    None,   'debug' ),
 	(  'x86_64',    'windows',       'msvc',  'static', 'windows', 'windows-2019', '.exe',    True,     True,    '.pdb',         None,'x86_64-win-msvc-static', 'release' ),
 	(  'x86_64',    'windows',       'msvc', 'dynamic', 'windows', 'windows-2019', '.exe',   False,    False,      None,         None,                    None,   'debug' ),
+	(  'x86_64',    'windows',       'msvc', 'dynamic', 'windows', 'windows-2019', '.exe',   False,    False,      None,  'backendvs',                    None,   'debug' ),
 	(  'x86_64',    'windows',       'msvc', 'dynamic', 'windows', 'windows-2019', '.exe',   False,    False,      None,         None,                    None, 'release' ),
 	(     'x86',    'windows',       'msvc',  'static', 'windows', 'windows-2019', '.exe',   False,    False,      None,         None,                    None,   'debug' ),
 	(     'x86',    'windows',       'msvc',  'static', 'windows', 'windows-2019', '.exe',    True,     True,    '.pdb',         None,  'i686-win-msvc-static', 'release' ),