From 8bb2e9f9f958c8f8713264e99e588510eac36683 Mon Sep 17 00:00:00 2001 From: rusefillc Date: Tue, 16 Aug 2022 16:49:06 -0400 Subject: [PATCH] reducing inconsistency between gen scripts --- firmware/config/boards/cypress/config/gen_cypress_config.sh | 1 - firmware/config/boards/kinetis/config/gen_kinetis_config.sh | 1 - firmware/config/boards/subaru_eg33/config/gen_subaru_config.sh | 1 - firmware/gen_config_board.sh | 2 +- firmware/gen_config_common.sh | 3 ++- 5 files changed, 3 insertions(+), 5 deletions(-) diff --git a/firmware/config/boards/cypress/config/gen_cypress_config.sh b/firmware/config/boards/cypress/config/gen_cypress_config.sh index bffdc32512..7456ed55ee 100755 --- a/firmware/config/boards/cypress/config/gen_cypress_config.sh +++ b/firmware/config/boards/cypress/config/gen_cypress_config.sh @@ -31,7 +31,6 @@ source gen_config_common.sh echo "Using COMMON_GEN_CONFIG [$COMMON_GEN_CONFIG]" java \ - -DSystemOut.name=logs/gen_config_hellen_cypress \ $COMMON_GEN_CONFIG_PREFIX \ -tool hellen_cypress_gen_config.bat \ $COMMON_GEN_CONFIG \ diff --git a/firmware/config/boards/kinetis/config/gen_kinetis_config.sh b/firmware/config/boards/kinetis/config/gen_kinetis_config.sh index b27f134823..6b5d7d39c5 100755 --- a/firmware/config/boards/kinetis/config/gen_kinetis_config.sh +++ b/firmware/config/boards/kinetis/config/gen_kinetis_config.sh @@ -31,7 +31,6 @@ source gen_config_common.sh echo "Using COMMON_GEN_CONFIG [$COMMON_GEN_CONFIG]" java \ - -DSystemOut.name=logs/gen_config_kinetis \ $COMMON_GEN_CONFIG_PREFIX \ -tool kinetis_gen_config.bat \ $COMMON_GEN_CONFIG \ diff --git a/firmware/config/boards/subaru_eg33/config/gen_subaru_config.sh b/firmware/config/boards/subaru_eg33/config/gen_subaru_config.sh index 96437f57e4..a454b93a0d 100755 --- a/firmware/config/boards/subaru_eg33/config/gen_subaru_config.sh +++ b/firmware/config/boards/subaru_eg33/config/gen_subaru_config.sh @@ -31,7 +31,6 @@ source gen_config_common.sh echo "Using COMMON_GEN_CONFIG [$COMMON_GEN_CONFIG]" java \ - -DSystemOut.name=logs/gen_config_subaru_eg33 \ $COMMON_GEN_CONFIG_PREFIX \ -tool ${BOARD_DIR}/config/gen_subaru_config.sh \ $COMMON_GEN_CONFIG \ diff --git a/firmware/gen_config_board.sh b/firmware/gen_config_board.sh index 942d1a72e7..c6e7cf27c4 100755 --- a/firmware/gen_config_board.sh +++ b/firmware/gen_config_board.sh @@ -43,7 +43,7 @@ echo "Using COMMON_GEN_CONFIG [$COMMON_GEN_CONFIG]" # work in progress: migrating to rusefi_${BUNDLE_NAME}.txt # in rare cases order of arguments is important - '-tool' should be specified before '-definition' -java -DSystemOut.name=logs/gen_config_board \ +java \ $COMMON_GEN_CONFIG_PREFIX \ -tool gen_config.sh \ $COMMON_GEN_CONFIG \ diff --git a/firmware/gen_config_common.sh b/firmware/gen_config_common.sh index 756adc949d..31d44c2f21 100755 --- a/firmware/gen_config_common.sh +++ b/firmware/gen_config_common.sh @@ -1,5 +1,6 @@ -COMMON_GEN_CONFIG_PREFIX="-jar ../java_tools/ConfigDefinition.jar" +COMMON_GEN_CONFIG_PREFIX=" -DSystemOut.name=logs/gen_config_${SHORT_BOARDNAME} \ + -jar ../java_tools/ConfigDefinition.jar" COMMON_GEN_CONFIG=" -enumInputFile controllers/algo/engine_types.h \