From 794f093057c58c4909a0653edb54fdf869560596 Mon Sep 17 00:00:00 2001 From: Stefan Boberg Date: Wed, 4 Mar 2026 14:00:34 +0100 Subject: native xmake toolchain definition for UE-clang (#805) This change is meant to provide a smoother experience when working on Linux. After this change, the toolchain setup process is now simply ```bash $ scripts/ue_build_linux/get_ue_toolchain.sh ``` and then at config time the toolchain is automatically detected if you downloaded it to the default location or have the `UE_TOOLCHAIN_DIR` environment variable set ```bash xmake config --mode=debug ``` Compared to the old script-based approach this configures the toolchain more precisely, avoiding leakage into unrelated build processes such as when a package manager decides to build something like Ninja locally etc. --- scripts/bundle.lua | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'scripts/bundle.lua') diff --git a/scripts/bundle.lua b/scripts/bundle.lua index 07e120d04..b2a5e1e08 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") -- cgit v1.2.3 From 2f0d60cb431ffefecf3e0a383528691be74af21b Mon Sep 17 00:00:00 2001 From: Stefan Boberg Date: Thu, 5 Mar 2026 14:31:27 +0100 Subject: oidctoken tool package (#810) * added OidcToken binary to the build process. The binary is mirrored from p4 and is placed next to the output of the build process. It is also placed in the release zip archives. * also fixed issue with Linux symbol stripping which was introduced in toolchain changes yesterday --- scripts/bundle.lua | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'scripts/bundle.lua') diff --git a/scripts/bundle.lua b/scripts/bundle.lua index b2a5e1e08..6f540c5b8 100644 --- a/scripts/bundle.lua +++ b/scripts/bundle.lua @@ -199,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) @@ -277,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 -------------------------------------------------------------------------------- @@ -288,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 -------------------------------------------------------------------------------- -- cgit v1.2.3 From 43b3823f2eea918162f53dd5409dcaa9dbd2fb02 Mon Sep 17 00:00:00 2001 From: Stefan Boberg Date: Wed, 11 Mar 2026 16:55:39 +0100 Subject: fix OidcToken casing (#826) fixes issue with zip not finding the OidcToken file --- scripts/bundle.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'scripts/bundle.lua') diff --git a/scripts/bundle.lua b/scripts/bundle.lua index 6f540c5b8..74b961d02 100644 --- a/scripts/bundle.lua +++ b/scripts/bundle.lua @@ -279,7 +279,7 @@ local function main_mac(signidentity) "build/macosx/universal/release/zenserver", "build/macosx/universal/release/zen", "build/macosx/universal/release/crashpad_handler", - "build/macosx/x86_64/release/Oidctoken") + "build/macosx/x86_64/release/OidcToken") end -------------------------------------------------------------------------------- @@ -291,7 +291,7 @@ local function main_linux() "build/linux/x86_64/release/zenserver", "build/linux/x86_64/release/zen", "build/linux/x86_64/release/crashpad_handler", - "build/linux/x86_64/release/Oidctoken") + "build/linux/x86_64/release/OidcToken") end -------------------------------------------------------------------------------- -- cgit v1.2.3 From be693a0b5dbd70271da04989a664c8c3b6919ae1 Mon Sep 17 00:00:00 2001 From: Dan Engelbrecht Date: Thu, 12 Mar 2026 14:36:26 +0100 Subject: fix casing of windows OidcToken.exe (#830) --- scripts/bundle.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'scripts/bundle.lua') diff --git a/scripts/bundle.lua b/scripts/bundle.lua index 74b961d02..6f4552890 100644 --- a/scripts/bundle.lua +++ b/scripts/bundle.lua @@ -200,7 +200,7 @@ local function main_windows(signidentity) "build/windows/x64/release/zen.exe", "build/windows/x64/release/zen.pdb", "build/windows/x64/release/crashpad_handler.exe", - "build/windows/x64/release/oidctoken.exe") + "build/windows/x64/release/OidcToken.exe") end -------------------------------------------------------------------------------- -- cgit v1.2.3