From b64fc05b0713adb68c7a24825114e2e9f1b77fdb Mon Sep 17 00:00:00 2001 From: rusefi Date: Fri, 7 Jun 2019 19:54:15 -0400 Subject: [PATCH] reducing scripts duplication --- firmware/clean.bat | 2 +- firmware/config/boards/nucleo_f746/!compile-nucleo_f746.bat | 2 +- firmware/config/boards/nucleo_f767/!compile-nucleo_f767.bat | 2 +- misc/jenkins/compile_other_versions/build_version.bat | 2 +- misc/jenkins/compile_other_versions/compile_and_upload.bat | 6 ++++-- simulator/clean.bat | 1 + 6 files changed, 9 insertions(+), 6 deletions(-) diff --git a/firmware/clean.bat b/firmware/clean.bat index 3deaa2bf90..f593dfc02a 100644 --- a/firmware/clean.bat +++ b/firmware/clean.bat @@ -1,3 +1,3 @@ -echo I am clean.bat +echo Entering firmware\clean.bat rd /s /q .dep rd /s /q build diff --git a/firmware/config/boards/nucleo_f746/!compile-nucleo_f746.bat b/firmware/config/boards/nucleo_f746/!compile-nucleo_f746.bat index 593ffbce32..444225b86c 100644 --- a/firmware/config/boards/nucleo_f746/!compile-nucleo_f746.bat +++ b/firmware/config/boards/nucleo_f746/!compile-nucleo_f746.bat @@ -2,7 +2,7 @@ rem rem STM32F767 version of the firmware for Nucleo-F746ZG board rem -bundle_nameset script_name=!compile-nucleo_f746.bat +set script_name=!compile-nucleo_f746.bat echo Entering %script_name% cd ../../.. diff --git a/firmware/config/boards/nucleo_f767/!compile-nucleo_f767.bat b/firmware/config/boards/nucleo_f767/!compile-nucleo_f767.bat index bbfb893d49..d80b908a73 100644 --- a/firmware/config/boards/nucleo_f767/!compile-nucleo_f767.bat +++ b/firmware/config/boards/nucleo_f767/!compile-nucleo_f767.bat @@ -2,7 +2,7 @@ rem rem STM32F767 version of the firmware for Nucleo-F767ZI board rem -bundle_nameset script_name=!compile-nucleo_f767.bat +set script_name=!compile-nucleo_f767.bat echo Entering %script_name% cd ../../.. diff --git a/misc/jenkins/compile_other_versions/build_version.bat b/misc/jenkins/compile_other_versions/build_version.bat index d1b58c1852..91cbd228cf 100644 --- a/misc/jenkins/compile_other_versions/build_version.bat +++ b/misc/jenkins/compile_other_versions/build_version.bat @@ -1,4 +1,4 @@ -bundle_nameset script_name=build_version.bat +set script_name=build_version.bat echo Entering %script_name% with %bundle_name% diff --git a/misc/jenkins/compile_other_versions/compile_and_upload.bat b/misc/jenkins/compile_other_versions/compile_and_upload.bat index 995b993210..2d1c1dd829 100644 --- a/misc/jenkins/compile_other_versions/compile_and_upload.bat +++ b/misc/jenkins/compile_other_versions/compile_and_upload.bat @@ -1,7 +1,7 @@ set COMPILE_FOLDER=%1 set COMPILE_SCRIPT=%2 -bundle_nameset script_name=combile_and_upload.bat +set script_name=combile_and_upload.bat echo Entering %script_name% with %COMPILE_FOLDER% %COMPILE_SCRIPT% @@ -20,9 +20,11 @@ cd firmware call clean.bat cd .. - cd firmware\config +pwd cd %COMPILE_FOLDER% +pwd +echo Invoking %COMPILE_SCRIPT% call %COMPILE_SCRIPT% diff --git a/simulator/clean.bat b/simulator/clean.bat index db4040288a..63d0d0d7e9 100644 --- a/simulator/clean.bat +++ b/simulator/clean.bat @@ -1,2 +1,3 @@ +echo Entering simulator\clean.bat rm -rf .dep rm -rf build