YangWX/crossdesk
1
0
Fork 0
mirror of https://github.com/kunkundi/crossdesk.git synced 2026-11-11 02:06:38 +08:00
Code Issues Packages Projects Releases Wiki Activity

[fix] update Windows resource and build define checks

Browse Source
This commit is contained in:
dijunkun
2026-11-10 22:53:42 +08:00
parent 8370bf95d1
commit da3c2ff2ab
2 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
apps/desktop/tests/build_define_scope_test.lua
+6 -5
View File
@@ -25,8 +25,9 @@ function main(plat, portable)
return table.contains(flatten(values), expected) return table.contains(flatten(values), expected)
end end
local function effective_defines(target) local function effective_defines(target)
-- Private dependency defines do not reach this target's compiler.
return table.join(table.wrap(target:get("defines")), return table.join(table.wrap(target:get("defines")),
flatten(target:get_from("defines", "dep::*"))) flatten(target:get_from("defines", "dep::*", {interface = true})))
end end
for _, name in ipairs({"minirtc", "media", "common", "crossdesk_wire", "rd_log"}) do 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 for name, resource in pairs(resources) do
local defines = targets[name]:fileconfig(path.translate( local defines = targets[name]:fileconfig(path.translate(
"apps/desktop/resources/windows/" .. resource .. ".rc")).defines "apps/desktop/resources/windows/" .. resource .. ".rc")).defines
assert(contains(defines, 'CROSSDESK_VERSION_STRING="v1.5.3-2-20260913"')) assert(contains(defines, 'CROSSDESK_VERSION_STRING="v1.5.3-2-20260913"'),
assert(contains(defines, "CROSSDESK_VERSION_NUMERIC=1,5,3,0")) name .. " resource has an incorrect version string")
assert(contains(defines, "CROSSDESK_PORTABLE=1") == assert(contains(defines, "CROSSDESK_VERSION_NUMERIC=1,5,3,0"),
(name == "crossdesk_session_helper" and portable == "true")) name .. " resource has an incorrect numeric version")
end end
end end
print("Build define scopes passed: %s portable=%s", plat, portable) print("Build define scopes passed: %s portable=%s", plat, portable)
apps/desktop/tests/windows_manifest_resource_test.cpp
+3 -2
View File
@@ -116,9 +116,10 @@ int main() {
ok &= ExpectContains("crossdesk_session_helper.rc", session_helper_rc, ok &= ExpectContains("crossdesk_session_helper.rc", session_helper_rc,
"crossdesk_session_helper.exe"); "crossdesk_session_helper.exe");
ok &= ExpectContains("crossdesk_session_helper.rc", session_helper_rc, 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, 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("wgc_plugin.rc", wgc_plugin_rc, "wgc_plugin.dll");
ok &= ExpectContains("version_info.rcinc", version_info, "ProductName"); ok &= ExpectContains("version_info.rcinc", version_info, "ProductName");
ok &= ExpectContains("version_info.rcinc", version_info, ok &= ExpectContains("version_info.rcinc", version_info,