From 58690660c4aa8ad2592bfa97799c14af59cc9061 Mon Sep 17 00:00:00 2001
From: Jan van der Weide <hertog@hermitcollective.net>
Date: Sun, 13 Apr 2025 22:15:59 +0200
Subject: [PATCH 1/2] fix: export_preset path not resetting propperly
---
justfile | 11 ++++-------
project/export_presets.cfg | 6 +++---
2 files changed, 7 insertions(+), 10 deletions(-)
diff --git a/justfile b/justfile
index f13b11e1..06982115 100644
--- a/justfile
+++ b/justfile
@@ -2,9 +2,6 @@ set export
BUILD_NAME := "change_me"
-release_template_path_linux := `realpath engine/bin/godot.linuxbsd.template_release.x86_64.llvm`
-release_template_path_windows := `realpath engine/bin/godot.windows.template_release.x86_64.llvm`
-
build:
cd engine/ && scons target=editor symbols=yes optimization=debug dev_build=yes linker=mold use_llvm=yes compiledb=yes
@@ -13,19 +10,19 @@ run: build
release-linux: build
cd engine/ && scons platform=linuxbsd target=template_release arch=x86_64 linker=mold use_llvm=yes compiledb=yes custom_modules="../modules"
- sed -i "s!{path}!{{release_template_path_linux}}!" project/export_presets.cfg
+ sed -i "s!templatepath!{{`realpath engine/bin/godot.linuxbsd.template_release.x86_64.llvm`}}!" project/export_presets.cfg
rm -rf build && mkdir build
engine/bin/godot.*.editor.dev.*.llvm --headless --export-release "Linux" project/project.godot && zip build.zip build/*
touch build/.gitkeep
- sed -i "s!{{release_template_path_linux}}!{path}!" project/export_presets.cfg
+ sed -i "s!{{`realpath engine/bin/godot.linuxbsd.template_release.x86_64.llvm`}}!templatepath!" project/export_presets.cfg
release-windows: build
cd engine/ && scons platform=windows target=template_release arch=x86_64 linker=mold use_llvm=yes compiledb=yes custom_modules="../modules"
- sed -i "s!{path}!{{release_template_path_windows}}!" project/export_presets.cfg
+ sed -i "s!templatepath!{{`realpath engine/bin/godot.windows.template_release.x86_64.llvm`}}!" 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/*
touch build/.gitkeep
- sed -i "s!{{release_template_path_windows}}!{path}!" project/export_presets.cfg
+ sed -i "s!{{`realpath engine/bin/godot.windows.template_release.x86_64.llvm`}}!templatepath!" project/export_presets.cfg
initialize-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
diff --git a/project/export_presets.cfg b/project/export_presets.cfg
index c7ac7659..a04762ac 100644
--- a/project/export_presets.cfg
+++ b/project/export_presets.cfg
@@ -21,7 +21,7 @@ script_export_mode=2
[preset.0.options]
custom_template/debug=""
-custom_template/release="{path}"
+custom_template/release="templatepath"
debug/export_console_wrapper=1
binary_format/embed_pck=false
texture_format/s3tc_bptc=true
@@ -45,7 +45,7 @@ rm -rf \"{temp_dir}\""
name="Windows"
platform="Windows Desktop"
runnable=true
-advanced_options=false
+advanced_options=true
dedicated_server=false
custom_features=""
export_filter="all_resources"
@@ -63,7 +63,7 @@ script_export_mode=2
[preset.1.options]
custom_template/debug=""
-custom_template/release="{path}"
+custom_template/release="templatepath"
debug/export_console_wrapper=1
binary_format/embed_pck=false
texture_format/s3tc_bptc=true
From 49689745dbe2e80e8a652677b4d6a4e30ebda1e0 Mon Sep 17 00:00:00 2001
From: Jan van der Weide <hertog@hermitcollective.net>
Date: Mon, 14 Apr 2025 13:04:03 +0200
Subject: [PATCH 2/2] added custom modules to build command
---
justfile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/justfile b/justfile
index 06982115..ad237ea9 100644
--- a/justfile
+++ b/justfile
@@ -3,7 +3,7 @@ set export
BUILD_NAME := "change_me"
build:
- cd engine/ && scons target=editor symbols=yes optimization=debug dev_build=yes linker=mold use_llvm=yes compiledb=yes
+ cd engine/ && scons target=editor symbols=yes optimization=debug dev_build=yes linker=mold use_llvm=yes compiledb=yes custom_modules="../modules"
run: build
engine/bin/godot.linuxbsd.editor.dev.x86_64.llvm --editor --path project