From 6481662092b141cf38469e9eac73b63c673ba331 Mon Sep 17 00:00:00 2001 From: rusefi Date: Wed, 4 Dec 2019 07:50:46 -0500 Subject: [PATCH] reducing code duplication & including kinetis --- firmware/config/boards/common_make.bat | 4 +++- firmware/config/boards/frankenso/!compile-frankenso_na6.bat | 1 - firmware/config/boards/me7_pnp/!compile-me7_pnp.bat | 2 -- firmware/config/boards/microrusefi/!compile-mre-f4-test.bat | 2 +- firmware/config/boards/microrusefi/!compile-mre-f4.bat | 2 +- firmware/config/boards/microrusefi/!compile-mre-f7-test.bat | 1 - firmware/config/boards/microrusefi/!compile-mre-f7.bat | 1 - .../config/boards/microrusefi/!compile-nucleo-Manhattan.bat | 1 - .../config/boards/nucleo_f746/!compile-stm32f746_nucleo.bat | 1 - .../config/boards/nucleo_f767/!compile-stm32f767_nucleo.bat | 1 - firmware/config/boards/nucleo_f767/!compile-stm32f767_osc.bat | 1 - firmware/config/boards/prometheus/!compile-prometheus_405.bat | 1 - firmware/config/boards/prometheus/!compile-prometheus_469.bat | 1 - misc/jenkins/compile_other_versions/run.bat | 4 ++++ 14 files changed, 9 insertions(+), 14 deletions(-) diff --git a/firmware/config/boards/common_make.bat b/firmware/config/boards/common_make.bat index 6e0a947eaf..3af123cbb1 100644 --- a/firmware/config/boards/common_make.bat +++ b/firmware/config/boards/common_make.bat @@ -15,4 +15,6 @@ echo %script_name%: invoking hex2dfu.exe cp build/rusefi.bin deliver/ echo %script_name%: deliver folder -ls -l deliver \ No newline at end of file +ls -l deliver + +call config/boards/clean_env_variables.bat \ No newline at end of file diff --git a/firmware/config/boards/frankenso/!compile-frankenso_na6.bat b/firmware/config/boards/frankenso/!compile-frankenso_na6.bat index 78b9086d01..61820cca1e 100644 --- a/firmware/config/boards/frankenso/!compile-frankenso_na6.bat +++ b/firmware/config/boards/frankenso/!compile-frankenso_na6.bat @@ -7,4 +7,3 @@ set EXTRA_PARAMS=-DDUMMY ^ call config/boards/common_make.bat -call config/boards/clean_env_variables.bat diff --git a/firmware/config/boards/me7_pnp/!compile-me7_pnp.bat b/firmware/config/boards/me7_pnp/!compile-me7_pnp.bat index fb693dd5c6..f184b60334 100644 --- a/firmware/config/boards/me7_pnp/!compile-me7_pnp.bat +++ b/firmware/config/boards/me7_pnp/!compile-me7_pnp.bat @@ -12,5 +12,3 @@ set EXTRA_PARAMS=-DDUMMY -DSTM32F767xx ^ set DEBUG_LEVEL_OPT="-O2" call config/boards/common_make.bat - -call config/boards/clean_env_variables.bat \ No newline at end of file diff --git a/firmware/config/boards/microrusefi/!compile-mre-f4-test.bat b/firmware/config/boards/microrusefi/!compile-mre-f4-test.bat index 6dcb87b573..21a6079dcb 100644 --- a/firmware/config/boards/microrusefi/!compile-mre-f4-test.bat +++ b/firmware/config/boards/microrusefi/!compile-mre-f4-test.bat @@ -7,4 +7,4 @@ set DEFAULT_ENGINE_TYPE = -DDEFAULT_ENGINE_TYPE=MRE_BOARD_TEST call config/boards/common_make.bat -call config/boards/clean_env_variables.bat + diff --git a/firmware/config/boards/microrusefi/!compile-mre-f4.bat b/firmware/config/boards/microrusefi/!compile-mre-f4.bat index 0f778d3f46..27d3a78e02 100644 --- a/firmware/config/boards/microrusefi/!compile-mre-f4.bat +++ b/firmware/config/boards/microrusefi/!compile-mre-f4.bat @@ -6,4 +6,4 @@ set PROJECT_CPU=ARCH_STM32F4 call config/boards/common_make.bat -call config/boards/clean_env_variables.bat + diff --git a/firmware/config/boards/microrusefi/!compile-mre-f7-test.bat b/firmware/config/boards/microrusefi/!compile-mre-f7-test.bat index 94333f48d4..bb742d4f97 100644 --- a/firmware/config/boards/microrusefi/!compile-mre-f7-test.bat +++ b/firmware/config/boards/microrusefi/!compile-mre-f7-test.bat @@ -9,4 +9,3 @@ set DEFAULT_ENGINE_TYPE = -DDEFAULT_ENGINE_TYPE=MRE_BOARD_TEST call config/boards/common_make.bat -call config/boards/clean_env_variables.bat diff --git a/firmware/config/boards/microrusefi/!compile-mre-f7.bat b/firmware/config/boards/microrusefi/!compile-mre-f7.bat index 9fa152962f..36752bb27d 100644 --- a/firmware/config/boards/microrusefi/!compile-mre-f7.bat +++ b/firmware/config/boards/microrusefi/!compile-mre-f7.bat @@ -8,4 +8,3 @@ set PROJECT_CPU=ARCH_STM32F7 call config/boards/common_make.bat -call config/boards/clean_env_variables.bat diff --git a/firmware/config/boards/microrusefi/!compile-nucleo-Manhattan.bat b/firmware/config/boards/microrusefi/!compile-nucleo-Manhattan.bat index b8e0a6b99e..8e972665dd 100644 --- a/firmware/config/boards/microrusefi/!compile-nucleo-Manhattan.bat +++ b/firmware/config/boards/microrusefi/!compile-nucleo-Manhattan.bat @@ -16,4 +16,3 @@ rem -DDEFAULT_ENGINE_TYPE=MRE_BOARD_TEST call config/boards/common_make.bat -call config/boards/clean_env_variables.bat diff --git a/firmware/config/boards/nucleo_f746/!compile-stm32f746_nucleo.bat b/firmware/config/boards/nucleo_f746/!compile-stm32f746_nucleo.bat index 446d586c97..cdc807cf5b 100644 --- a/firmware/config/boards/nucleo_f746/!compile-stm32f746_nucleo.bat +++ b/firmware/config/boards/nucleo_f746/!compile-stm32f746_nucleo.bat @@ -19,4 +19,3 @@ set EXTRA_PARAMS=-DDUMMY -DSTM32F746xx ^ set DEBUG_LEVEL_OPT="-O2" call config/boards/common_make.bat -call config/boards/clean_env_variables.bat \ No newline at end of file diff --git a/firmware/config/boards/nucleo_f767/!compile-stm32f767_nucleo.bat b/firmware/config/boards/nucleo_f767/!compile-stm32f767_nucleo.bat index 9dc2697717..df9b87c88f 100644 --- a/firmware/config/boards/nucleo_f767/!compile-stm32f767_nucleo.bat +++ b/firmware/config/boards/nucleo_f767/!compile-stm32f767_nucleo.bat @@ -19,4 +19,3 @@ set DEBUG_LEVEL_OPT="-O2" call config/boards/common_make.bat -call config/boards/clean_env_variables.bat diff --git a/firmware/config/boards/nucleo_f767/!compile-stm32f767_osc.bat b/firmware/config/boards/nucleo_f767/!compile-stm32f767_osc.bat index 9ac9e9cd6d..cbf1f791ce 100644 --- a/firmware/config/boards/nucleo_f767/!compile-stm32f767_osc.bat +++ b/firmware/config/boards/nucleo_f767/!compile-stm32f767_osc.bat @@ -19,4 +19,3 @@ set DEBUG_LEVEL_OPT="-O2" call config/boards/common_make.bat -call config/boards/clean_env_variables.bat diff --git a/firmware/config/boards/prometheus/!compile-prometheus_405.bat b/firmware/config/boards/prometheus/!compile-prometheus_405.bat index cf60ed61d2..1502021057 100644 --- a/firmware/config/boards/prometheus/!compile-prometheus_405.bat +++ b/firmware/config/boards/prometheus/!compile-prometheus_405.bat @@ -7,4 +7,3 @@ set PROJECT_BOARD=prometheus/f405 call config/boards/common_make.bat -call config/boards/clean_env_variables.bat \ No newline at end of file diff --git a/firmware/config/boards/prometheus/!compile-prometheus_469.bat b/firmware/config/boards/prometheus/!compile-prometheus_469.bat index b5fb8b3e37..040f7f8daf 100644 --- a/firmware/config/boards/prometheus/!compile-prometheus_469.bat +++ b/firmware/config/boards/prometheus/!compile-prometheus_469.bat @@ -8,4 +8,3 @@ set USE_BOOTLOADER=yes call config/boards/common_make.bat -call config/boards/clean_env_variables.bat diff --git a/misc/jenkins/compile_other_versions/run.bat b/misc/jenkins/compile_other_versions/run.bat index 200186c635..5aa0c82a1a 100644 --- a/misc/jenkins/compile_other_versions/run.bat +++ b/misc/jenkins/compile_other_versions/run.bat @@ -10,6 +10,10 @@ if not exist java_console_binary/rusefi_console.jar exit -1 call misc\jenkins\build_simulator.bat if not exist simulator/build/rusefi_simulator.exe exit -1 +call misc\jenkins\compile_other_versions\compile_and_upload.bat kinetis kinetis +IF NOT ERRORLEVEL 0 echo ERROR invoking compile_and_upload.bat +IF NOT ERRORLEVEL 0 EXIT /B 1 + call misc\jenkins\compile_other_versions\compile_and_upload.bat frankenso frankenso_na6 IF NOT ERRORLEVEL 0 echo ERROR invoking compile_and_upload.bat IF NOT ERRORLEVEL 0 EXIT /B 1