diff options
Diffstat (limited to 'scripts/bundle.lua')
| -rw-r--r-- | scripts/bundle.lua | 35 |
1 files changed, 32 insertions, 3 deletions
diff --git a/scripts/bundle.lua b/scripts/bundle.lua index 6689ee9e9..ef63df0fb 100644 --- a/scripts/bundle.lua +++ b/scripts/bundle.lua @@ -32,12 +32,22 @@ local function _build(arch, debug, config_args) ret = _exec("xmake", "clean", "--yes", "zenserver") if ret > 0 then - raise("Clean failed") + raise("Clean zenserver failed") + end + + ret = _exec("xmake", "clean", "--yes", "zen") + if ret > 0 then + raise("Clean zen failed") end ret = _exec("xmake", "build", "--yes", "zenserver") if ret > 0 then - raise("Build failed") + raise("Build zenserver failed") + end + + ret = _exec("xmake", "build", "--yes", "zen") + if ret > 0 then + raise("Build zen failed") end end @@ -173,6 +183,7 @@ local function main_windows() _build("x64", false, config_args) _append_content_zip("build/windows/x64/release/zenserver.exe") + _append_content_zip("build/windows/x64/release/zens.exe") local crashpad_handler_path = _find_vcpkg_binary( "x64-windows-static", @@ -183,6 +194,8 @@ local function main_windows() zip_path, "build/windows/x64/release/zenserver.exe", "build/windows/x64/release/zenserver.pdb", + "build/windows/x64/release/zen.exe", + "build/windows/x64/release/zen.pdb", crashpad_handler_path) end @@ -201,11 +214,24 @@ local function main_mac() "build/macosx/arm64/release/zenserver" ) if ret > 0 then - raise("Failed creating universal binary") + raise("Failed creating universal zenserver binary") end _append_content_zip("build/macosx/universal/release/zenserver") + ret = _exec( + "lipo", + "-create", + "-output", "build/macosx/universal/release/zen", + "build/macosx/x86_64/release/zen", + "build/macosx/arm64/release/zen" + ) + if ret > 0 then + raise("Failed creating universal zen binary") + end + + _append_content_zip("build/macosx/universal/release/zen") + -- At the time of writing vcpkg does not support sentry-native on arm64. Once -- it does we can create a univeral binary for this. For now just bundle x64 local crashpad_handler_path = _find_vcpkg_binary( @@ -217,6 +243,7 @@ local function main_mac() _zip(false, "build/zenserver-macos.zip", "build/macosx/universal/release/zenserver", + "build/macosx/universal/release/zen", crashpad_handler_path) end @@ -234,12 +261,14 @@ local function main_linux() --]] _append_content_zip("build/linux/x86_64/release/zenserver") + _append_content_zip("build/linux/x86_64/release/zen") _exec("scripts/bundle_linux.sh") _zip(false, "build/zenserver-linux.zip", "build/appimage/zenserver", + "build/linux/x86_64/release/zen", crashpad_handler_path) end |