From 82f2cae0f64de7c3bef2c438a18c8f4a9675e08b Mon Sep 17 00:00:00 2001 From: Sara Date: Mon, 23 Jun 2025 21:13:38 +0200 Subject: [PATCH 1/7] fix: added .cache and build artifacts to gitignore --- .gitignore | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.gitignore b/.gitignore index b8680775..3035daa0 100644 --- a/.gitignore +++ b/.gitignore @@ -6,9 +6,15 @@ config.log .sconf_temp +# build artifacts +*.o +compile_commands.json engine/.github project/.godot build/PROJECT.pck build/PROJECT.x86_64 build/PROJECT.exe build.zip + +# general-purpose cache folder (used by e.g clangd) +.cache From 6f11ca2a482f17b8f715bf92858cc1f5d12dec24 Mon Sep 17 00:00:00 2001 From: hertog Date: Thu, 24 Jul 2025 13:28:23 +0000 Subject: [PATCH 2/7] 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 3/7] 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 4/7] 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: From 6214be9525bf5085e2b9bd3cf5a6a2f493b652c8 Mon Sep 17 00:00:00 2001 From: Sara Date: Sun, 23 Nov 2025 13:51:49 +0000 Subject: [PATCH 5/7] fix: added -i -e to sed ./justfile --- justfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/justfile b/justfile index 6b0fc5a4..c4d5a10d 100644 --- a/justfile +++ b/justfile @@ -39,7 +39,7 @@ release-windows: build initialize-template projectname: # Initializing Template {{projectname}} sed -i -e "s/PROJECT/{{projectname}}/g" ./modules/PROJECT/register_types.h ./modules/PROJECT/register_types.cpp ./project/project.godot ./project/export_presets.cfg .gitignore - sed "s/change_me/{{projectname}}/" ./justfile + sed -i -e "s/change_me/{{projectname}}/" ./justfile mv ./modules/PROJECT ./modules/{{projectname}} # Done Initializing, you will still have to update BUILD_NAME in your justfile From d87b782d6d5766c28848694291b033337bac5589 Mon Sep 17 00:00:00 2001 From: Sara Date: Sun, 21 Dec 2025 14:30:58 +0100 Subject: [PATCH 6/7] fix: justfile updates self to rename build --- justfile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/justfile b/justfile index ad0c5d09..a4de92f4 100644 --- a/justfile +++ b/justfile @@ -37,9 +37,8 @@ release-windows: build initialize-template projectname: # Initializing Template {{projectname}} sed -i -e "s/PROJECT/{{projectname}}/g" ./modules/PROJECT/register_types.h ./modules/PROJECT/register_types.cpp ./project/project.godot ./project/export_presets.cfg .gitignore - sed "s/change_me/{{projectname}}/" ./justfile + sed -i -e "s/change_me/{{projectname}}/" ./justfile mv ./modules/PROJECT ./modules/{{projectname}} - # Done Initializing, you will still have to update BUILD_NAME in your justfile format: # Formatting Custom Modules From 71b3ecd3db730392ff080536a3200039d9b6a9b1 Mon Sep 17 00:00:00 2001 From: Sara Date: Mon, 29 Dec 2025 17:10:12 +0100 Subject: [PATCH 7/7] feat: added .dir-locals.el emacs config file --- .dir-locals.el | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 .dir-locals.el diff --git a/.dir-locals.el b/.dir-locals.el new file mode 100644 index 00000000..2438524f --- /dev/null +++ b/.dir-locals.el @@ -0,0 +1,4 @@ +((c-mode . ((mode . c++))) + (c++-mode . ((mode . clang-format-on-save))) + (nil . ((projectile-project-compilation-cmd . "just build") + (projectile-project-run-cmd . "engine/bin/godot.linuxbsd.editor.dev.x86_64.llvm"))))