From 090fa01465470a78a641a0a9e340dec295ac03b2 Mon Sep 17 00:00:00 2001 From: rusefi Date: Mon, 10 Jun 2019 23:13:32 -0400 Subject: [PATCH] generating without build folder, faster fail in case of failure --- firmware/gen_config.bat | 14 ++++++++++++++ java_tools/ConfigDefinition.jar | Bin 87313 -> 87543 bytes .../src/com/rusefi/ConfigDefinition.java | 10 ++++++++++ 3 files changed, 24 insertions(+) diff --git a/firmware/gen_config.bat b/firmware/gen_config.bat index 7ceaeab12c..139b7aa04d 100644 --- a/firmware/gen_config.bat +++ b/firmware/gen_config.bat @@ -1,3 +1,4 @@ +@echo off 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 @@ -5,6 +6,8 @@ rem the storage section of rusefi.ini is updated as well rem lazy is broken - TS input is not considered a change rm build/config.gen +mkdir build + java -Drusefi.generator.lazyfile.enabled=true ^ -jar ../java_tools/ConfigDefinition.jar ^ -definition integration\rusefi_config.txt ^ @@ -13,6 +16,8 @@ java -Drusefi.generator.lazyfile.enabled=true ^ -c_defines controllers\algo\rusefi_generated.h ^ -c_destination controllers\algo\engine_configuration_generated_structures.h ^ -java_destination ../java_console -skip build/config.gen +IF NOT ERRORLEVEL 0 echo ERROR generating +IF NOT ERRORLEVEL 0 EXIT /B 1 rem This would automatically copy latest file to 'dev' TS project @@ -21,5 +26,14 @@ echo %ts_path% cp tunerstudio/rusefi.ini %ts_path%\mainController.ini call gen_config_board microrusefi +IF NOT ERRORLEVEL 0 echo ERROR generating +IF NOT ERRORLEVEL 0 EXIT /B 1 + call gen_config_board frankenso +IF NOT ERRORLEVEL 0 echo ERROR generating +IF NOT ERRORLEVEL 0 EXIT /B 1 + call gen_config_board prometheus +IF NOT ERRORLEVEL 0 echo ERROR generating +IF NOT ERRORLEVEL 0 EXIT /B 1 + diff --git a/java_tools/ConfigDefinition.jar b/java_tools/ConfigDefinition.jar index a48eb984b93129f48f0fef7d1f6dd3d512b78255..0ca66111a5a8f8b0ee807a6097540425a0b58195 100644 GIT binary patch delta 8764 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 CWL*US delta 8532 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 diff --git a/java_tools/configuration_definition/src/com/rusefi/ConfigDefinition.java b/java_tools/configuration_definition/src/com/rusefi/ConfigDefinition.java index 1e98102f51..87e3cb8b00 100644 --- a/java_tools/configuration_definition/src/com/rusefi/ConfigDefinition.java +++ b/java_tools/configuration_definition/src/com/rusefi/ConfigDefinition.java @@ -40,6 +40,16 @@ public class ConfigDefinition { public static String definitionInputFile = null; public static void main(String[] args) throws IOException { + try { + doJob(args); + } catch (Throwable e) { + System.out.println(e); + e.printStackTrace(); + System.exit(-1); + } + } + + private static void doJob(String[] args) throws IOException { if (args.length < 2) { System.out.println("Please specify\r\n" + KEY_DEFINITION + " x\r\n"