From e7086a85b77b71bbdef45fbb434128f9225c7042 Mon Sep 17 00:00:00 2001 From: alphanin9 <47785076+alphanin9@users.noreply.github.com> Date: Sun, 26 Jan 2025 03:13:00 +0200 Subject: [PATCH 1/4] feat: PDB generation for the release build --- .github/workflows/build.yml | 5 +++++ xmake.lua | 14 ++++++++++++-- 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 3e844b30..5e8fc437 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -50,3 +50,8 @@ jobs: with: name: ${{ matrix.os }}-${{ matrix.arch }}-${{ matrix.mode }} path: package/** + + - uses: actions/upload-artifact@v4 + with: + name: ${{ matrix.os }}-${{ matrix.arch }}-${{ matrix.mode }}-pdb + path: package_pdb/** \ No newline at end of file diff --git a/xmake.lua b/xmake.lua index 576aee4a..1182d4ba 100644 --- a/xmake.lua +++ b/xmake.lua @@ -29,7 +29,7 @@ elseif is_mode("releasedbg") then vsRuntime = vsRuntime.."d" elseif is_mode("release") then add_defines("NDEBUG") - set_symbols("hidden") + set_symbols("debug") set_strip("all") set_optimize("fastest") set_runtimes("MD") @@ -80,6 +80,7 @@ target("cyber_engine_tweaks") import("net.http") os.rm("package/*") + os.rm("package_pdb/*") os.mkdir("package/bin/x64/plugins/cyber_engine_tweaks/tweakdb") http.download("https://github.com/WolvenKit/WolvenKit/raw/main/WolvenKit.Common/Resources/usedhashes.kark", "package/bin/x64/plugins/cyber_engine_tweaks/tweakdb/usedhashes.kark") @@ -96,7 +97,16 @@ target("cyber_engine_tweaks") os.cp("LICENSE", "package/bin/x64/") os.cp("ThirdParty_LICENSES", "package/bin/x64/plugins/cyber_engine_tweaks/ThirdParty_LICENSES") - os.cp(target:targetfile(), "package/bin/x64/plugins/") + local target_file = target:targetfile() + + os.cp(target_file, "package/bin/x64/plugins/") + + os.mkdir("package_pdb/bin/x64") + + os.cp(path.join( + path.directory(target_file), + path.basename(target_file)..".pdb" + ), "package_pdb/bin/x64/plugins/") end) on_install(function(target) cprint("${green bright}Installing Cyber Engine Tweaks ..") From 293318b457da7370f6d651bbf323d18ce914a939 Mon Sep 17 00:00:00 2001 From: alphanin9 <47785076+alphanin9@users.noreply.github.com> Date: Sun, 26 Jan 2025 03:24:33 +0200 Subject: [PATCH 2/4] fix: Explicitly add package_pdb to gitignore --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index d2870782..d8a8db25 100644 --- a/.gitignore +++ b/.gitignore @@ -14,6 +14,7 @@ build/* *.asi src/CETVersion.h package/* +package_pdb/* vs2022/* vsxmake*/ *.pyc From df274bbe76390cd761a1474e3c375a023c060604 Mon Sep 17 00:00:00 2001 From: alphanin9 <47785076+alphanin9@users.noreply.github.com> Date: Tue, 28 Jan 2025 03:26:22 +0200 Subject: [PATCH 3/4] fix: Review, test if PDB gets uploaded correctly! --- .github/workflows/build.yml | 6 ++++-- xmake.lua | 5 +---- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 5e8fc437..32e3cd96 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -49,9 +49,11 @@ jobs: - uses: actions/upload-artifact@v4 with: name: ${{ matrix.os }}-${{ matrix.arch }}-${{ matrix.mode }} - path: package/** + path: | + package/** + !package/**/*.pdb - uses: actions/upload-artifact@v4 with: name: ${{ matrix.os }}-${{ matrix.arch }}-${{ matrix.mode }}-pdb - path: package_pdb/** \ No newline at end of file + path: package/**/*.pdb \ No newline at end of file diff --git a/xmake.lua b/xmake.lua index 1182d4ba..0e904908 100644 --- a/xmake.lua +++ b/xmake.lua @@ -80,7 +80,6 @@ target("cyber_engine_tweaks") import("net.http") os.rm("package/*") - os.rm("package_pdb/*") os.mkdir("package/bin/x64/plugins/cyber_engine_tweaks/tweakdb") http.download("https://github.com/WolvenKit/WolvenKit/raw/main/WolvenKit.Common/Resources/usedhashes.kark", "package/bin/x64/plugins/cyber_engine_tweaks/tweakdb/usedhashes.kark") @@ -101,12 +100,10 @@ target("cyber_engine_tweaks") os.cp(target_file, "package/bin/x64/plugins/") - os.mkdir("package_pdb/bin/x64") - os.cp(path.join( path.directory(target_file), path.basename(target_file)..".pdb" - ), "package_pdb/bin/x64/plugins/") + ), "package/bin/x64/plugins/") end) on_install(function(target) cprint("${green bright}Installing Cyber Engine Tweaks ..") From 496d936e20d053cf3f85b541761687f1b079726f Mon Sep 17 00:00:00 2001 From: alphanin9 <47785076+alphanin9@users.noreply.github.com> Date: Wed, 29 Jan 2025 13:04:43 +0200 Subject: [PATCH 4/4] Remove now-unnecessary .gitignore line Co-authored-by: Octavian Dima <3403191+wopss@users.noreply.github.com> --- .gitignore | 1 - 1 file changed, 1 deletion(-) diff --git a/.gitignore b/.gitignore index d8a8db25..d2870782 100644 --- a/.gitignore +++ b/.gitignore @@ -14,7 +14,6 @@ build/* *.asi src/CETVersion.h package/* -package_pdb/* vs2022/* vsxmake*/ *.pyc