Go back to (inferior) default godot method of same build location

Author: MrAwesome

gui/godot/decktricks-cli.gdextension

@@ -4,5 +4,5 @@ compatibility_minimum = 4.4
 reloadable = true
 
 [libraries]
-linux.debug.x86_64 =     "res://build/debug/libdecktricks_godot_gui.so"
-linux.release.x86_64 =   "res://build/release/libdecktricks_godot_gui.so"
+linux.debug.x86_64 =     "res://build/libdecktricks_godot_gui.so"
+linux.release.x86_64 =   "res://build/libdecktricks_godot_gui.so"

gui/godot/export_presets.cfg

@@ -1,6 +1,6 @@
 [preset.0]
 
-name="linux-release"
+name="Linux"
 platform="Linux"
 runnable=false
 advanced_options=true
@@ -9,7 +9,7 @@ custom_features=""
 export_filter="all_resources"
 include_filter=""
 exclude_filter=""
-export_path="build/release/decktricks-gui"
+export_path="build/decktricks-gui"
 patches=PackedStringArray()
 encryption_include_filters=""
 encryption_exclude_filters=""
@@ -40,44 +40,4 @@ ssh_remote_deploy/cleanup_script="#!/usr/bin/env bash
 kill $(pgrep -x -f \"{temp_dir}/{exe_name} {cmd_args}\")
 rm -rf \"{temp_dir}\""
 
-[preset.1]
-
-name="linux-debug"
-platform="Linux"
-runnable=true
-advanced_options=true
-dedicated_server=false
-custom_features=""
-export_filter="all_resources"
-include_filter=""
-exclude_filter=""
-export_path="build/debug/decktricks-gui"
-patches=PackedStringArray()
-encryption_include_filters=""
-encryption_exclude_filters=""
-seed=0
-encrypt_pck=false
-encrypt_directory=false
-script_export_mode=2
-
-[preset.1.options]
-
-custom_template/debug=""
-custom_template/release=""
-debug/export_console_wrapper=1
-binary_format/embed_pck=true
-texture_format/s3tc_bptc=true
-texture_format/etc2_astc=false
-binary_format/architecture="x86_64"
-ssh_remote_deploy/enabled=false
-ssh_remote_deploy/host="user@host_ip"
-ssh_remote_deploy/port="22"
-ssh_remote_deploy/extra_args_ssh=""
-ssh_remote_deploy/extra_args_scp=""
-ssh_remote_deploy/run_script="#!/usr/bin/env bash
-export DISPLAY=:0
-unzip -o -q \"{temp_dir}/{archive_name}\" -d \"{temp_dir}\"
-\"{temp_dir}/{exe_name}\" {cmd_args}"
-ssh_remote_deploy/cleanup_script="#!/usr/bin/env bash
-kill $(pgrep -x -f \"{temp_dir}/{exe_name} {cmd_args}\")
-rm -rf \"{temp_dir}\""
+ 

gui/rust/src/bin/gui_tool.rs

@@ -140,14 +140,14 @@ fn godot_export(is_debug_build: bool) {
     cmd.current_dir(GODOT_BASE_DIR)
         .arg("--headless");
     if is_debug_build {
-        cmd.args(["--export-debug", "linux-debug", &output_path.to_string_lossy()]);
+        cmd.args(["--export-debug", "Linux", &output_path.to_string_lossy()]);
     } else {
-        cmd.args(["--export-release", "linux-release", &output_path.to_string_lossy()]);
+        cmd.args(["--export-release", "Linux", &output_path.to_string_lossy()]);
     }
     let human = if is_debug_build {
-        format!("{} --headless --export-debug linux-debug", godot_bin)
+        format!("{} --headless --export-debug Linux", godot_bin)
     } else {
-        format!("{} --headless --export-release linux-release", godot_bin)
+        format!("{} --headless --export-release Linux", godot_bin)
     };
     let output = run_cmd_capture(cmd, &human);
     let stdout = String::from_utf8_lossy(&output.stdout);
@@ -187,16 +187,12 @@ fn resolve_godot_bin() -> String {
     "godot".to_string()
 }
 
-fn get_exported_binary_path(is_debug_build: bool) -> PathBuf {
-    get_build_dir(is_debug_build).join("decktricks-gui")
+fn get_exported_binary_path(_is_debug_build: bool) -> PathBuf {
+    Path::new(GODOT_BUILD_BASE_DIR).join("decktricks-gui")
 }
 
-fn get_build_dir(is_debug_build: bool) -> PathBuf {
-    if is_debug_build {
-        Path::new(GODOT_BUILD_BASE_DIR).join("debug")
-    } else {
-        Path::new(GODOT_BUILD_BASE_DIR).join("release")
-    }
+fn get_build_dir(_is_debug_build: bool) -> PathBuf {
+    Path::new(GODOT_BUILD_BASE_DIR).to_path_buf()
 }
 
 fn run_cmd(mut cmd: Command, human: &str) {