From ead88f50f0bc25b04b5affd23e57bbf3c76a5055 Mon Sep 17 00:00:00 2001 From: rusefi Date: Sun, 9 Jun 2019 19:03:53 -0400 Subject: [PATCH] nicer bundle folder structure and reducing unneeded content #833 --- java_console/autotest/src/com/rusefi/ExecHelper.java | 1 + java_console/ui/src/com/rusefi/Launcher.java | 1 + .../ui/src/com/rusefi/maintenance/FirmwareFlasher.java | 6 ++++-- java_console/ui/src/com/rusefi/ui/config/IniFileModel.java | 4 +++- 4 files changed, 9 insertions(+), 3 deletions(-) diff --git a/java_console/autotest/src/com/rusefi/ExecHelper.java b/java_console/autotest/src/com/rusefi/ExecHelper.java index 827c44d8b7..a550825020 100644 --- a/java_console/autotest/src/com/rusefi/ExecHelper.java +++ b/java_console/autotest/src/com/rusefi/ExecHelper.java @@ -11,6 +11,7 @@ import java.util.function.Consumer; * (c) Andrey Belomutskiy */ public class ExecHelper { + // see also SimulatorHelper private static final String SIMULATOR_BINARY = "../simulator/build/rusefi_simulator.exe"; static Process simulatorProcess; diff --git a/java_console/ui/src/com/rusefi/Launcher.java b/java_console/ui/src/com/rusefi/Launcher.java index 9fe6846823..efc4957d80 100644 --- a/java_console/ui/src/com/rusefi/Launcher.java +++ b/java_console/ui/src/com/rusefi/Launcher.java @@ -48,6 +48,7 @@ import static com.rusefi.ui.storage.PersistentConfiguration.getConfig; public class Launcher { public static final int CONSOLE_VERSION = 20190608; public static final boolean SHOW_STIMULATOR = false; + public static final String INPUT_FILES_PATH = "."; private static final String TAB_INDEX = "main_tab"; protected static final String PORT_KEY = "port"; protected static final String SPEED_KEY = "speed"; diff --git a/java_console/ui/src/com/rusefi/maintenance/FirmwareFlasher.java b/java_console/ui/src/com/rusefi/maintenance/FirmwareFlasher.java index 030f805409..39789ce23f 100644 --- a/java_console/ui/src/com/rusefi/maintenance/FirmwareFlasher.java +++ b/java_console/ui/src/com/rusefi/maintenance/FirmwareFlasher.java @@ -5,13 +5,15 @@ import java.awt.event.ActionEvent; import java.awt.event.ActionListener; import java.io.File; +import static com.rusefi.Launcher.INPUT_FILES_PATH; + /** * (c) Andrey Belomutskiy 2013-2018 * 2/4/15 */ public class FirmwareFlasher extends ProcessStatusWindow { - public static final String IMAGE_FILE = "rusefi.bin"; - public static final String IMAGE_NO_ASSERTS_FILE = "rusefi_no_asserts.bin"; + public static final String IMAGE_FILE = INPUT_FILES_PATH + File.separator + "rusefi.bin"; + public static final String IMAGE_NO_ASSERTS_FILE = INPUT_FILES_PATH + File.separator + "rusefi_no_asserts.bin"; static final String OPENOCD_EXE = "openocd/openocd.exe"; static final String BINARY_LOCATION = "."; private static final String SUCCESS_MESSAGE_TAG = "shutdown command invoked"; diff --git a/java_console/ui/src/com/rusefi/ui/config/IniFileModel.java b/java_console/ui/src/com/rusefi/ui/config/IniFileModel.java index 1c5eeeefbc..7fa86884fb 100644 --- a/java_console/ui/src/com/rusefi/ui/config/IniFileModel.java +++ b/java_console/ui/src/com/rusefi/ui/config/IniFileModel.java @@ -6,13 +6,15 @@ import com.opensr5.io.RawIniFile; import java.io.*; import java.util.*; +import static com.rusefi.Launcher.INPUT_FILES_PATH; + /** * (c) Andrey Belomutskiy * 12/23/2015. */ public class IniFileModel { // todo: https://sourceforge.net/p/rusefi/tickets/243/ - private static final String FILENAME = "rusefi.ini"; + private static final String FILENAME = INPUT_FILES_PATH + File.separator + "rusefi.ini"; private final static IniFileModel INSTANCE = new IniFileModel(); private String dialogId;