From 61830efffd8ee2e7fb030ffcf1fba500c3da3d5c Mon Sep 17 00:00:00 2001
From: rusefillc <rusefillc@gmail.com>
Date: Wed, 19 Feb 2025 15:37:19 -0500
Subject: [PATCH] in order to facilitate console development we shall unify
 source code 'java_console_binary' with deployment 'console' folder adjusting
 useful files

---
 .github/workflows/build-rusEFI-console.yaml | 2 +-
 .gitignore                                  | 2 +-
 java_tools/java_tools.mk                    | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/build-rusEFI-console.yaml b/.github/workflows/build-rusEFI-console.yaml
index c387ac2dff..42a8adf8cb 100644
--- a/.github/workflows/build-rusEFI-console.yaml
+++ b/.github/workflows/build-rusEFI-console.yaml
@@ -67,4 +67,4 @@ jobs:
 
       - name: Upload rusEFI server
         working-directory: .
-        run: java_console/upload_file.sh ${{ secrets.RUSEFI_SSH_USER }} ${{ secrets.RUSEFI_SSH_PASS }} ${{ secrets.RUSEFI_SSH_SERVER }} build_server/autoupdate java_console_binary/rusefi_server.jar
+        run: java_console/upload_file.sh ${{ secrets.RUSEFI_SSH_USER }} ${{ secrets.RUSEFI_SSH_PASS }} ${{ secrets.RUSEFI_SSH_SERVER }} build_server/autoupdate console/rusefi_server.jar
diff --git a/.gitignore b/.gitignore
index 8c10fa34bc..cba855d03b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -15,7 +15,7 @@ Debug/
 doxygen/
 /.idea
 workspace.xml
-java_console_binary
+/console
 .vscode/.*
 *.cmp
 *.net
diff --git a/java_tools/java_tools.mk b/java_tools/java_tools.mk
index d5b60ebf71..a9d6da0897 100644
--- a/java_tools/java_tools.mk
+++ b/java_tools/java_tools.mk
@@ -16,8 +16,8 @@ CONFIG_DEFINITION_BASE_JAR = $(JAVA_TOOLS)/configuration_definition_base/build/l
 ENUM_TO_STRING_JAR = $(JAVA_TOOLS)/enum_to_string/build/libs/enum_to_string-all.jar
 # TUNE_TOOLS_JAR = $(JAVA_TOOLS)/tune-tools/build/libs/tune-tools-all.jar
 TS_PLUGIN_LAUNCHER_JAR = $(JAVA_TOOLS)/ts_plugin_launcher/build/jar/rusefi_ts_plugin_launcher.jar
-CONSOLE_JAR = $(PROJECT_DIR)/../java_console_binary/rusefi_console.jar
-AUTOUPDATE_JAR = $(PROJECT_DIR)/../java_console_binary/rusefi_autoupdate.jar
+CONSOLE_JAR = $(PROJECT_DIR)/../console/rusefi_console.jar
+AUTOUPDATE_JAR = $(PROJECT_DIR)/../console/rusefi_autoupdate.jar
 
 # We use .FORCE to always rebuild these tools. Gradle won't actually touch the jars if it doesn't need to,
 # so we don't have to worry about triggering rebuilds of things that have these tools as a prerequisite.