Merge branch 'main' into lm/oidctoken-exe-path

1 files changed, 19 insertions, 5 deletions

diff --git a/scripts/bundle.lua b/scripts/bundle.lua
index debb1e615..6f540c5b8 100644
--- a/scripts/bundle.lua
+++ b/scripts/bundle.lua
@@ -17,7 +17,15 @@ end
 
 --------------------------------------------------------------------------------
 local function _build(arch, debug, config_args)
+    import("core.project.config")
+    config.load()
+
     variant = debug and "debug" or "release"
+
+    -- Preserve toolchain/sdk from current config so --clean doesn't lose them
+    local toolchain_arg = config.get("toolchain") and ("--toolchain=" .. config.get("toolchain")) or nil
+    local sdk_arg = config.get("sdk") and ("--sdk=" .. config.get("sdk")) or nil
+
     local ret = _exec(
         "xmake",
         "config",
@@ -26,6 +34,8 @@ local function _build(arch, debug, config_args)
         "--mode="..variant,
         "--arch="..arch,
         "--zensentry=yes",
+        toolchain_arg,
+        sdk_arg,
         config_args)
     if ret > 0 then
         raise("Failed to configure xmake")
@@ -176,7 +186,8 @@ local function main_windows(signidentity)
             "/v",
             "/as",
             "build/windows/x64/release/zenserver.exe",
-            "build/windows/x64/release/zen.exe")
+            "build/windows/x64/release/zen.exe",
+            "build/windows/x64/release/crashpad_handler.exe")
         if ret > 0 then
             raise("Failed signing zenserver binary")
         end
@@ -188,8 +199,9 @@ local function main_windows(signidentity)
         "build/windows/x64/release/zenserver.pdb",
         "build/windows/x64/release/zen.exe",
         "build/windows/x64/release/zen.pdb",
-        "build/windows/x64/release/crashpad_handler.exe")
-end
+        "build/windows/x64/release/crashpad_handler.exe",
+        "build/windows/x64/release/oidctoken.exe")
+    end
 
 --------------------------------------------------------------------------------
 local function main_mac(signidentity)
@@ -266,7 +278,8 @@ local function main_mac(signidentity)
         "build/zenserver-macos.zip",
         "build/macosx/universal/release/zenserver",
         "build/macosx/universal/release/zen",
-        "build/macosx/universal/release/crashpad_handler")
+        "build/macosx/universal/release/crashpad_handler",
+        "build/macosx/x86_64/release/Oidctoken")
 end
 
 --------------------------------------------------------------------------------
@@ -277,7 +290,8 @@ local function main_linux()
         "build/zenserver-linux.zip",
         "build/linux/x86_64/release/zenserver",
         "build/linux/x86_64/release/zen",
-        "build/linux/x86_64/release/crashpad_handler")
+        "build/linux/x86_64/release/crashpad_handler",
+        "build/linux/x86_64/release/Oidctoken")
 end
 
 --------------------------------------------------------------------------------