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.
This commit is contained in:
parent
a594ae996d
commit
1ff6a2d0ae
29
.github/build.sh
vendored
29
.github/build.sh
vendored
@ -206,6 +206,26 @@ fi
|
|||||||
if [[ $PACKAGE_MODE == nolua ]]; then
|
if [[ $PACKAGE_MODE == nolua ]]; then
|
||||||
meson_configure+=$'\t'-Dlua=none
|
meson_configure+=$'\t'-Dlua=none
|
||||||
fi
|
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
|
if [[ $BSH_STATIC_DYNAMIC == static ]]; then
|
||||||
meson_configure+=$'\t'-Dstatic=prebuilt
|
meson_configure+=$'\t'-Dstatic=prebuilt
|
||||||
if [[ $BSH_HOST_PLATFORM == windows ]]; then
|
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
|
meson configure -Dcan_install=no -Dignore_updates=true -Dbuild_render=false -Dbuild_font=false
|
||||||
strip_target=$APP_EXE
|
strip_target=$APP_EXE
|
||||||
fi
|
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
|
set +e
|
||||||
ninja -v -d keeprsp
|
meson_compile+=$'\t'--ninja-args='["-d","keeprsp"]'
|
||||||
|
$meson_compile
|
||||||
ninja_code=$?
|
ninja_code=$?
|
||||||
set -e
|
set -e
|
||||||
cat $APP_EXE.exe.rsp
|
cat $APP_EXE.exe.rsp
|
||||||
@ -417,7 +440,7 @@ if [[ $BSH_BUILD_PLATFORM == windows ]]; then
|
|||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
else
|
else
|
||||||
ninja -v
|
$meson_compile
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [[ $SEPARATE_DEBUG == yes ]] && [[ $BSH_HOST_PLATFORM-$BSH_HOST_LIBC != windows-msvc ]]; then
|
if [[ $SEPARATE_DEBUG == yes ]] && [[ $BSH_HOST_PLATFORM-$BSH_HOST_LIBC != windows-msvc ]]; then
|
||||||
|
1
.github/prepare.py
vendored
1
.github/prepare.py
vendored
@ -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', 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', '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, 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_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', False, False, None, None, None, 'debug' ),
|
||||||
( 'x86', 'windows', 'msvc', 'static', 'windows', 'windows-2019', '.exe', True, True, '.pdb', None, 'i686-win-msvc-static', 'release' ),
|
( 'x86', 'windows', 'msvc', 'static', 'windows', 'windows-2019', '.exe', True, True, '.pdb', None, 'i686-win-msvc-static', 'release' ),
|
||||||
|
Loading…
Reference in New Issue
Block a user