in order to facilitate console development we shall unify source code 'java_console_binary' with deployment 'console' folder

adjusting useful files
This commit is contained in:
rusefillc 2025-02-19 15:37:19 -05:00
parent ab6047ef31
commit 61830efffd
3 changed files with 4 additions and 4 deletions

View File

@ -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

2
.gitignore vendored
View File

@ -15,7 +15,7 @@ Debug/
doxygen/
/.idea
workspace.xml
java_console_binary
/console
.vscode/.*
*.cmp
*.net

View File

@ -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.