[feat] integrate CrossDesk CLI with terminal rendering and npm packaging

This commit is contained in:
dijunkun
2026-10-30 10:42:23 +08:00
parent 2f57d0aba3
commit 699d867956
34 changed files with 3811 additions and 18 deletions
+51 -16
View File
@@ -11,14 +11,35 @@ set_languages("c++17")
set_encodings("utf-8")
add_requires("nlohmann_json 3.11.3")
option("CROSSDESK_BUILD_DESKTOP")
set_default(desktop_platform)
set_showmenu(true)
set_description("Build the desktop client")
option_end()
option("CROSSDESK_BUILD_CLI")
set_default(false)
set_showmenu(true)
set_description("Build the terminal controller")
option_end()
local build_desktop = desktop_platform and not is_config("CROSSDESK_BUILD_DESKTOP", false)
local build_cli = has_config("CROSSDESK_BUILD_CLI")
if build_cli and not desktop_platform then
raise("CrossDesk CLI supports Windows, macOS and Linux")
end
if desktop_platform then
includes(path.join(source_dir, "apps/desktop/xmake/options.lua"))
setup_options_and_dependencies(build_desktop)
end
if build_desktop then
includes(path.join(source_dir, "apps/desktop/xmake/platform.lua"))
includes(path.join(source_dir, "apps/desktop/xmake/rules/slint.lua"))
includes(path.join(source_dir, "apps/desktop/xmake/rules/about_resources.lua"))
includes(path.join(source_dir, "apps/desktop/xmake/targets.lua"))
setup_options_and_dependencies()
setup_platform_settings()
end
@@ -26,28 +47,42 @@ local wire_dir = path.join(source_dir, "libs/wire")
target("crossdesk_wire")
set_kind("static")
add_packages("nlohmann_json")
add_packages("nlohmann_json", {public = true})
add_files(path.join(wire_dir, "src/*.cpp"))
add_headerfiles(path.join(wire_dir,
"include/(*.h)"))
add_includedirs(path.join(wire_dir, "include"), {public = true})
target_end()
target("crossdesk_wire_test")
set_kind("binary")
set_default(false)
add_deps("crossdesk_wire")
add_files(path.join(wire_dir, "tests/wire_test.cpp"))
target_end()
-- CLI source packages omit tests; full checkouts retain these existing targets.
if os.isdir(path.join(wire_dir, "tests")) then
target("crossdesk_wire_test")
set_kind("binary")
set_default(false)
add_deps("crossdesk_wire")
add_files(path.join(wire_dir, "tests/wire_test.cpp"))
target_end()
target("keyboard_state_wire_test")
set_kind("binary")
set_default(false)
add_deps("crossdesk_wire")
add_files(path.join(wire_dir,
"tests/keyboard_state_wire_test.cpp"))
target_end()
target("keyboard_state_wire_test")
set_kind("binary")
set_default(false)
add_deps("crossdesk_wire")
add_files(path.join(wire_dir,
"tests/keyboard_state_wire_test.cpp"))
target_end()
end
if desktop_platform then
if build_desktop then
setup_targets()
end
if build_cli then
-- Desktop setup already includes MiniRTC and the shared OpenSSL recipe.
if not build_desktop then
add_requireconfs("**.openssl", "**.openssl3",
{version = "3.3.2", system = false, override = true})
includes(path.join(source_dir, "deps/thirdparty/openssl"))
includes(path.join(source_dir, "deps/submodules/minirtc"))
end
includes(path.join(source_dir, "apps/cli/xmake.lua"))
end