From 54f9d77f466e7cf86da8da503e79336b80584299 Mon Sep 17 00:00:00 2001 From: rusefi Date: Mon, 27 May 2019 06:55:10 -0400 Subject: [PATCH] recovering rom raider generation --- firmware/gen_config.bat | 2 +- java_tools/ConfigDefinition.jar | Bin 60679 -> 60757 bytes .../src/com/rusefi/ConfigDefinition.java | 8 ++++++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/firmware/gen_config.bat b/firmware/gen_config.bat index 2d407d451a..96fd2000b1 100644 --- a/firmware/gen_config.bat +++ b/firmware/gen_config.bat @@ -1,7 +1,7 @@ rem This batch files reads rusefi_config.txt and produses firmware persistent configuration headers rem the storage section of rusefi.ini is updated as well -java -jar ../java_tools/ConfigDefinition.jar -definition integration\rusefi_config.txt -ts_destination tunerstudio -c_destination controllers\algo -java_destination ../java_console -skip build/config.gen +java -jar ../java_tools/ConfigDefinition.jar -definition integration\rusefi_config.txt -romraider integration -ts_destination tunerstudio -c_destination controllers\algo -java_destination ../java_console -skip build/config.gen rem This would automatically copy latest file to 'dev' TS project diff --git a/java_tools/ConfigDefinition.jar b/java_tools/ConfigDefinition.jar index d31f170716152498b7f4a2eefa0953d5993142d2..cec97617d64547e4d87fe180396709e5bfe81ada 100644 GIT binary patch delta 7862 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 delta 7803 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 GqW=M`6&zOp diff --git a/java_tools/configuration_definition/src/com/rusefi/ConfigDefinition.java b/java_tools/configuration_definition/src/com/rusefi/ConfigDefinition.java index 73463b60af..00d0aae3d5 100644 --- a/java_tools/configuration_definition/src/com/rusefi/ConfigDefinition.java +++ b/java_tools/configuration_definition/src/com/rusefi/ConfigDefinition.java @@ -26,6 +26,7 @@ public class ConfigDefinition { private static final String ROM_RAIDER_XML_OUTPUT = "rusefi.xml"; private static final String ENGINE_CONFIGURATION_GENERATED_STRUCTURES_H = "engine_configuration_generated_structures.h"; private static final String KEY_DEFINITION = "-definition"; + private static final String KEY_ROM_INPUT = "-romraider"; private static final String KEY_TS_DESTINATION = "-ts_destination"; private static final String KEY_C_DESTINATION = "-c_destination"; private static final String KEY_CONSOLE_DESTINATION = "-java_destination"; @@ -51,6 +52,7 @@ public class ConfigDefinition { String javaConsolePath = null; String prependFile = null; String skipRebuildFile = null; + String romRaiderInputFile = null; for (int i = 0; i < args.length - 1; i += 2) { String key = args[i]; @@ -66,6 +68,8 @@ public class ConfigDefinition { prependFile = args[i + 1]; } else if (key.equals(KEY_SKIP)) { skipRebuildFile = args[i + 1]; + } else if (key.equals(KEY_ROM_INPUT)) { + romRaiderInputFile = args[i + 1]; } } @@ -116,8 +120,8 @@ public class ConfigDefinition { VariableRegistry.INSTANCE.writeNumericsToFile(headerDestinationFolder); - String inputFileName = definitionInputFile + File.separator + ROM_RAIDER_XML_TEMPLATE; - if (javaConsolePath != null) { + if (javaConsolePath != null && romRaiderInputFile != null) { + String inputFileName = romRaiderInputFile + File.separator + ROM_RAIDER_XML_TEMPLATE; String outputFileName = javaConsolePath + File.separator + ROM_RAIDER_XML_OUTPUT; processTextTemplate(inputFileName, outputFileName); }