From fa38c0b4bee035d06cd688ead002e2e48077f74d Mon Sep 17 00:00:00 2001 From: Matthew Kennedy Date: Wed, 20 Mar 2024 01:32:04 -0700 Subject: [PATCH] set -euo pipefail --- firmware/gen_enum_to_string.sh | 20 +++++--------------- 1 file changed, 5 insertions(+), 15 deletions(-) diff --git a/firmware/gen_enum_to_string.sh b/firmware/gen_enum_to_string.sh index d8b5b95bd7..fbb8d45f17 100755 --- a/firmware/gen_enum_to_string.sh +++ b/firmware/gen_enum_to_string.sh @@ -1,14 +1,14 @@ #!/bin/bash -echo "This batch files reads rusefi_enums.h and produces auto_generated_enums.* files" +# This script reads various C/C++ enums and produces auto_generated_enums.* files" + +set -euo pipefail rm gen_enum_to_string.log -java -DSystemOut.name=logs/gen_java_enum -cp ../java_tools/enum2string.jar com.rusefi.ToJavaEnum -enumInputFile controllers/sensors/sensor_type.h -outputPath ../java_console/io/src/main/java/com/rusefi/enums -[ $? -eq 0 ] || { echo "ERROR generating sensors"; exit 1; } +java -DSystemOut.name=logs/gen_java_enum -cp ../java_tools/enum2string.jar com.rusefi.ToJavaEnum -enumInputFile controllers/sensors/sensor_type.h -outputPath ../java_console/io/src/main/java/com/rusefi/enum -java -DSystemOut.name=logs/gen_java_enum -cp ../java_tools/enum2string.jar com.rusefi.ToJavaEnum -enumInputFile controllers/algo/engine_types.h -outputPath ../java_console/io/src/main/java/com/rusefi/enums -definition integration/rusefi_config.txt -[ $? -eq 0 ] || { echo "ERROR generating types"; exit 1; } +java -DSystemOut.name=logs/gen_java_enum -cp ../java_tools/enum2string.jar com.rusefi.ToJavaEnum -enumInputFile controllers/algo/engine_types.h -outputPath ../java_console/io/src/main/java/com/rusefi/enums -definition integration/rusefi_config.tx java -DSystemOut.name=logs/gen_enum_to_string \ -jar ../java_tools/enum2string.jar \ @@ -16,24 +16,18 @@ java -DSystemOut.name=logs/gen_enum_to_string \ -generatedFile commonenum \ -enumInputFile controllers/algo/rusefi_enums.h -[ $? -eq 0 ] || { echo "ERROR generating enums"; exit 1; } - java -DSystemOut.name=logs/gen_enum_to_string \ -jar ../java_tools/enum2string.jar \ -outputPath controllers/trigger/decoders \ -generatedFile sync_edge \ -enumInputFile controllers/trigger/decoders/sync_edge.h -[ $? -eq 0 ] || { echo "ERROR generating enums"; exit 1; } - java -DSystemOut.name=logs/gen_enum_to_string \ -jar ../java_tools/enum2string.jar \ -outputPath controllers/algo \ -generatedFile enginetypes \ -enumInputFile controllers/algo/engine_types.h -[ $? -eq 0 ] || { echo "ERROR generating enums"; exit 1; } - # TODO: rearrange enums so that we have WAY less duplicated generated code? at the moment too many enums are generated 4 times java -DSystemOut.name=logs/gen_enum_to_string \ @@ -41,12 +35,8 @@ java -DSystemOut.name=logs/gen_enum_to_string \ -outputPath controllers/algo \ -enumInputFile controllers/algo/rusefi_hw_enums.h \ -[ $? -eq 0 ] || { echo "ERROR generating hw_enums"; exit 1; } - java -DSystemOut.name=logs/gen_enum_to_string \ -jar ../java_tools/enum2string.jar \ -outputPath controllers/sensors \ -generatedFile sensor \ -enumInputFile controllers/sensors/sensor_type.h - -[ $? -eq 0 ] || { echo "ERROR generating sensors"; exit 1; }