nicer bundle folder structure and reducing unneeded content #833

This commit is contained in:
rusefi 2019-06-09 19:03:53 -04:00
parent e9fc99f758
commit ead88f50f0
4 changed files with 9 additions and 3 deletions

View File

@ -11,6 +11,7 @@ import java.util.function.Consumer;
* (c) Andrey Belomutskiy * (c) Andrey Belomutskiy
*/ */
public class ExecHelper { public class ExecHelper {
// see also SimulatorHelper
private static final String SIMULATOR_BINARY = "../simulator/build/rusefi_simulator.exe"; private static final String SIMULATOR_BINARY = "../simulator/build/rusefi_simulator.exe";
static Process simulatorProcess; static Process simulatorProcess;

View File

@ -48,6 +48,7 @@ import static com.rusefi.ui.storage.PersistentConfiguration.getConfig;
public class Launcher { public class Launcher {
public static final int CONSOLE_VERSION = 20190608; public static final int CONSOLE_VERSION = 20190608;
public static final boolean SHOW_STIMULATOR = false; public static final boolean SHOW_STIMULATOR = false;
public static final String INPUT_FILES_PATH = ".";
private static final String TAB_INDEX = "main_tab"; private static final String TAB_INDEX = "main_tab";
protected static final String PORT_KEY = "port"; protected static final String PORT_KEY = "port";
protected static final String SPEED_KEY = "speed"; protected static final String SPEED_KEY = "speed";

View File

@ -5,13 +5,15 @@ import java.awt.event.ActionEvent;
import java.awt.event.ActionListener; import java.awt.event.ActionListener;
import java.io.File; import java.io.File;
import static com.rusefi.Launcher.INPUT_FILES_PATH;
/** /**
* (c) Andrey Belomutskiy 2013-2018 * (c) Andrey Belomutskiy 2013-2018
* 2/4/15 * 2/4/15
*/ */
public class FirmwareFlasher extends ProcessStatusWindow { public class FirmwareFlasher extends ProcessStatusWindow {
public static final String IMAGE_FILE = "rusefi.bin"; public static final String IMAGE_FILE = INPUT_FILES_PATH + File.separator + "rusefi.bin";
public static final String IMAGE_NO_ASSERTS_FILE = "rusefi_no_asserts.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 OPENOCD_EXE = "openocd/openocd.exe";
static final String BINARY_LOCATION = "."; static final String BINARY_LOCATION = ".";
private static final String SUCCESS_MESSAGE_TAG = "shutdown command invoked"; private static final String SUCCESS_MESSAGE_TAG = "shutdown command invoked";

View File

@ -6,13 +6,15 @@ import com.opensr5.io.RawIniFile;
import java.io.*; import java.io.*;
import java.util.*; import java.util.*;
import static com.rusefi.Launcher.INPUT_FILES_PATH;
/** /**
* (c) Andrey Belomutskiy * (c) Andrey Belomutskiy
* 12/23/2015. * 12/23/2015.
*/ */
public class IniFileModel { public class IniFileModel {
// todo: https://sourceforge.net/p/rusefi/tickets/243/ // 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 final static IniFileModel INSTANCE = new IniFileModel();
private String dialogId; private String dialogId;