From da3c2ff2abaab6cc2df17fd57857d7fb09e3e1dc Mon Sep 17 00:00:00 2001 From: dijunkun Date: Tue, 10 Nov 2026 22:53:42 +0800 Subject: [PATCH] [fix] update Windows resource and build define checks --- apps/desktop/tests/build_define_scope_test.lua | 11 ++++++----- apps/desktop/tests/windows_manifest_resource_test.cpp | 5 +++-- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/apps/desktop/tests/build_define_scope_test.lua b/apps/desktop/tests/build_define_scope_test.lua index 0f624f03..8db0a07f 100644 --- a/apps/desktop/tests/build_define_scope_test.lua +++ b/apps/desktop/tests/build_define_scope_test.lua @@ -25,8 +25,9 @@ function main(plat, portable) return table.contains(flatten(values), expected) end local function effective_defines(target) + -- Private dependency defines do not reach this target's compiler. return table.join(table.wrap(target:get("defines")), - flatten(target:get_from("defines", "dep::*"))) + flatten(target:get_from("defines", "dep::*", {interface = true}))) end for _, name in ipairs({"minirtc", "media", "common", "crossdesk_wire", "rd_log"}) do @@ -73,10 +74,10 @@ function main(plat, portable) for name, resource in pairs(resources) do local defines = targets[name]:fileconfig(path.translate( "apps/desktop/resources/windows/" .. resource .. ".rc")).defines - assert(contains(defines, 'CROSSDESK_VERSION_STRING="v1.5.3-2-20260913"')) - assert(contains(defines, "CROSSDESK_VERSION_NUMERIC=1,5,3,0")) - assert(contains(defines, "CROSSDESK_PORTABLE=1") == - (name == "crossdesk_session_helper" and portable == "true")) + assert(contains(defines, 'CROSSDESK_VERSION_STRING="v1.5.3-2-20260913"'), + name .. " resource has an incorrect version string") + assert(contains(defines, "CROSSDESK_VERSION_NUMERIC=1,5,3,0"), + name .. " resource has an incorrect numeric version") end end print("Build define scopes passed: %s portable=%s", plat, portable) diff --git a/apps/desktop/tests/windows_manifest_resource_test.cpp b/apps/desktop/tests/windows_manifest_resource_test.cpp index f7eda1c5..bb8233fb 100644 --- a/apps/desktop/tests/windows_manifest_resource_test.cpp +++ b/apps/desktop/tests/windows_manifest_resource_test.cpp @@ -116,9 +116,10 @@ int main() { ok &= ExpectContains("crossdesk_session_helper.rc", session_helper_rc, "crossdesk_session_helper.exe"); ok &= ExpectContains("crossdesk_session_helper.rc", session_helper_rc, - "CROSSDESK_PORTABLE"); + "CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST " + "\"crossdesk_session_helper.manifest\""); ok &= ExpectContains("crossdesk_session_helper.rc", session_helper_rc, - "crossdesk_portable.manifest"); + "version_info.rcinc"); ok &= ExpectContains("wgc_plugin.rc", wgc_plugin_rc, "wgc_plugin.dll"); ok &= ExpectContains("version_info.rcinc", version_info, "ProductName"); ok &= ExpectContains("version_info.rcinc", version_info,