From 6f11ca2a482f17b8f715bf92858cc1f5d12dec24 Mon Sep 17 00:00:00 2001 From: hertog Date: Thu, 24 Jul 2025 13:28:23 +0000 Subject: [PATCH 1/3] Update .gitignore --- .gitignore | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.gitignore b/.gitignore index b8680775..046e750a 100644 --- a/.gitignore +++ b/.gitignore @@ -12,3 +12,9 @@ build/PROJECT.pck build/PROJECT.x86_64 build/PROJECT.exe build.zip + +*.o +compile_commands.json +.cache +.kdev4 +*.kdev4 \ No newline at end of file From 10ec9bb2bf13a5f18ad2463fb048551ec9d4294c Mon Sep 17 00:00:00 2001 From: Johannes Hendrik Gerard van der Weide Date: Thu, 24 Jul 2025 14:46:03 +0000 Subject: [PATCH 2/3] Feat: compiledb is now used (more) dynamically --- .gitignore | 4 +++- justfile | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 046e750a..49817eab 100644 --- a/.gitignore +++ b/.gitignore @@ -15,6 +15,8 @@ build.zip *.o compile_commands.json +.tree.hash .cache .kdev4 -*.kdev4 \ No newline at end of file +*.kdev4 +*__pycache__ diff --git a/justfile b/justfile index ad0c5d09..5bd11c06 100644 --- a/justfile +++ b/justfile @@ -1,10 +1,12 @@ set export BUILD_NAME := "change_me" +tree_hash := `tree ./modules | md5sum` +compiledb := if tree_hash == `cat .tree.hash` { "no" } else { "yes" } build: format # Compiling Editor - cd engine/ && scons target=editor symbols=yes optimization=debug dev_build=yes linker=mold use_llvm=yes compiledb=yes custom_modules="../modules" + cd engine/ && scons target=editor symbols=yes optimization=debug dev_build=yes linker=mold use_llvm=yes compiledb={{compiledb}} custom_modules="../modules" run: build # Running Editor From b0c56c0d30288367cfbbd5189d8a3dc9d32ba1e8 Mon Sep 17 00:00:00 2001 From: Johannes Hendrik Gerard van der Weide Date: Thu, 24 Jul 2025 14:48:32 +0000 Subject: [PATCH 3/3] Fix: fixed windows release having llvm --- justfile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/justfile b/justfile index 5bd11c06..6b0fc5a4 100644 --- a/justfile +++ b/justfile @@ -14,7 +14,7 @@ run: build release-linux: build # Compiling Linux Release - cd engine/ && scons platform=linuxbsd target=template_release arch=x86_64 linker=mold use_llvm=yes compiledb=yes custom_modules="../modules" + cd engine/ && scons platform=linuxbsd target=template_release arch=x86_64 linker=mold use_llvm=yes custom_modules="../modules" # Preparing Build Environment sed -i "s!templatepath!{{`realpath engine/bin/godot.linuxbsd.template_release.x86_64.llvm`}}!" project/export_presets.cfg rm -rf build && mkdir build @@ -26,14 +26,14 @@ release-linux: build release-windows: build # Compiling Windows Release - cd engine/ && scons platform=windows target=template_release arch=x86_64 linker=mold use_llvm=yes compiledb=yes custom_modules="../modules" + cd engine/ && scons platform=windows target=template_release arch=x86_64 linker=mold custom_modules="../modules" # Preparing Build Environment - sed -i "s!templatepath!{{`realpath engine/bin/godot.windows.template_release.x86_64.llvm`}}!" project/export_presets.cfg + sed -i "s!templatepath!{{`realpath engine/bin/godot.windows.template_release.x86_64`}}!" project/export_presets.cfg rm -rf build && mkdir build engine/bin/godot.*.editor.dev.*.llvm --headless --export-release "Windows" project/project.godot && zip build.zip build/* # Resetting Build Environment touch build/.gitkeep - sed -i "s!{{`realpath engine/bin/godot.windows.template_release.x86_64.llvm`}}!templatepath!" project/export_presets.cfg + sed -i "s!{{`realpath engine/bin/godot.windows.template_release.x86_64`}}!templatepath!" project/export_presets.cfg # Completed Windows Release Build initialize-template projectname: