rusefi
/
rusefi-full
mirror of https://github.com/rusefi/rusefi-full.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Switch to Bash (#1585) 

* switch firmware to bash

* switch unit_testts to bash

* switch jenkins to bash
This commit is contained in:
David Holdeman 2020-07-09 09:27:20 -05:00 committed by GitHub
parent d31cb79119
commit 779029caed
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
68 changed files with 116 additions and 108 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
firmware/bootloader/clean_bootloader.sh
View File

@ -1,3 +1,3 @@
#!/bin/sh #!/bin/bash
make -f src/Makefile clean make -f src/Makefile clean

4
firmware/bootloader/compile_bootloader.sh
View File

@ -1,4 +1,4 @@
#!/bin/sh #!/bin/bash
SCRIPT_NAME="compile_bootloader.sh" SCRIPT_NAME="compile_bootloader.sh"
echo "Entering $SCRIPT_NAME" echo "Entering $SCRIPT_NAME"
@ -26,4 +26,4 @@ cd ..
touch bootloader_storage.c touch bootloader_storage.c
pwd pwd
sh ../config/boards/clean_env_variables.sh bash ../config/boards/clean_env_variables.sh

4
firmware/bootloader/compile_bootloader_discovery407.sh
View File

@ -1,4 +1,4 @@
#!/bin/sh #!/bin/bash
echo "Starting compilation for Discovery-407" echo "Starting compilation for Discovery-407"
@ -14,4 +14,4 @@ export BOOTLOADER_CODE_DESTINATION_PATH=".."
export BOOTLOADER_COMMENT="/*F4discovery*/" export BOOTLOADER_COMMENT="/*F4discovery*/"
# set DEBUG_LEVEL_OPT="-O2" # set DEBUG_LEVEL_OPT="-O2"
sh compile_bootloader.sh bash compile_bootloader.sh

2
firmware/clean.bat
View File

@ -1,2 +1,2 @@
@echo off @echo off
sh.exe clean.sh bash.exe clean.sh

2
firmware/clean.sh
View File

@ -1,3 +1,5 @@
#!/bin/bash
echo "Entering firmware/clean.sh" echo "Entering firmware/clean.sh"
rm -rf .dep rm -rf .dep
rm -rf build rm -rf build

2
firmware/clean_compile_two_versions.bat
View File

@ -1,2 +1,2 @@
@echo off @echo off
sh.exe clean_compile_two_versions.sh bash.exe clean_compile_two_versions.sh

6
firmware/clean_compile_two_versions.sh
View File

@ -1,4 +1,4 @@
#!/bin/sh #!/bin/bash
echo "Compiler gcc version" echo "Compiler gcc version"
arm-none-eabi-gcc -v arm-none-eabi-gcc -v
@ -6,7 +6,7 @@ arm-none-eabi-gcc -v
rm -rf deliver rm -rf deliver
mkdir deliver mkdir deliver
#sh clean.sh #bash clean.sh
#echo "TIMESTAMP $(date "+%D %T.%2N")" #echo "TIMESTAMP $(date "+%D %T.%2N")"
#EXTRA_PARAMS="-DDUMMY -DFIRMWARE_ID=\\\"default_no_assert\\\" -DEFI_ENABLE_ASSERTS=FALSE -DCH_DBG_ENABLE_ASSERTS=FALSE -DCH_DBG_ENABLE_STACK_CHECK=FALSE -DCH_DBG_FILL_THREADS=FALSE -DCH_DBG_THREADS_PROFILING=FALSE" #EXTRA_PARAMS="-DDUMMY -DFIRMWARE_ID=\\\"default_no_assert\\\" -DEFI_ENABLE_ASSERTS=FALSE -DCH_DBG_ENABLE_ASSERTS=FALSE -DCH_DBG_ENABLE_STACK_CHECK=FALSE -DCH_DBG_FILL_THREADS=FALSE -DCH_DBG_THREADS_PROFILING=FALSE"
@ -22,7 +22,7 @@ mkdir deliver
#ls -l build #ls -l build
#[ -e deliver/rusefi_no_asserts.hex ] || { echo "FAILED to compile NO ASSERTS version"; exit 1; } #[ -e deliver/rusefi_no_asserts.hex ] || { echo "FAILED to compile NO ASSERTS version"; exit 1; }
sh clean.sh bash clean.sh
echo "TIMESTAMP $(date "+%D %T.%2N")" echo "TIMESTAMP $(date "+%D %T.%2N")"
EXTRA_PARAMS="-DDUMMY -DFIRMWARE_ID=\\\"default\\\"" EXTRA_PARAMS="-DDUMMY -DFIRMWARE_ID=\\\"default\\\""
make -j4 make -j4

2
firmware/config/boards/clean_env_variables.sh
View File

@ -1,4 +1,4 @@
#!/bin/sh #!/bin/bash
echo "clean_env_variables.sh: Cleaning up so that no one inherits any of these values" echo "clean_env_variables.sh: Cleaning up so that no one inherits any of these values"
export DEBUG_LEVEL_OPT="" export DEBUG_LEVEL_OPT=""

4
firmware/config/boards/common_make.sh
View File

@ -1,3 +1,5 @@
#!/bin/bash
SCRIPT_NAME="common_make.sh" SCRIPT_NAME="common_make.sh"
echo "Entering $SCRIPT_NAME" echo "Entering $SCRIPT_NAME"
@ -22,4 +24,4 @@ cp build/rusefi.bin deliver/
echo "$SCRIPT_NAME: deliver folder" echo "$SCRIPT_NAME: deliver folder"
ls -l deliver ls -l deliver
sh config/boards/clean_env_variables.sh bash config/boards/clean_env_variables.sh

2
firmware/config/boards/frankenso/!compile_frankenso_na6.bat
View File

@ -1,2 +1,2 @@
@echo off @echo off
sh.exe compile_frankenso_na6.sh bash.exe compile_frankenso_na6.sh

2
firmware/config/boards/frankenso/!compile_frankenso_pal.bat
View File

@ -1,2 +1,2 @@
@echo off @echo off
sh.exe compile_frankenso_pal.sh bash.exe compile_frankenso_pal.sh

4
firmware/config/boards/frankenso/compile_frankenso_na6.sh
View File

@ -1,4 +1,4 @@
#!/bin/sh #!/bin/bash
cd ../../.. cd ../../..
@ -11,5 +11,5 @@ export EXTRA_PARAMS="-DDUMMY \
\ \
-DFIRMWARE_ID=\\\"frankensoNA6\\\"" -DFIRMWARE_ID=\\\"frankensoNA6\\\""
sh config/boards/common_make.sh bash config/boards/common_make.sh

4
firmware/config/boards/frankenso/compile_frankenso_pal.sh
View File

@ -1,4 +1,4 @@
#!/bin/sh #!/bin/bash
cd ../../.. cd ../../..
@ -11,5 +11,5 @@ export EXTRA_PARAMS="-DDUMMY \
-DEFI_LOGIC_ANALYZER=FALSE \ -DEFI_LOGIC_ANALYZER=FALSE \
-DFIRMWARE_ID=\\\"frankensoNA6\\\"" -DFIRMWARE_ID=\\\"frankensoNA6\\\""
sh config/boards/common_make.sh bash config/boards/common_make.sh

2
firmware/config/boards/kinetis/!compile_kinetis.bat
View File

@ -1,2 +1,2 @@
@echo off @echo off
sh.exe compile_kinetis.sh bash.exe compile_kinetis.sh

4
firmware/config/boards/kinetis/compile_kinetis.sh
View File

@ -1,4 +1,4 @@
#!/bin/sh #!/bin/bash
echo "Compiling for Kinetis MKE16F512" echo "Compiling for Kinetis MKE16F512"
# TODO: somehow this -DDUMMY is helping us to not mess up the parameters, why?! # TODO: somehow this -DDUMMY is helping us to not mess up the parameters, why?!
@ -22,4 +22,4 @@ cd ../../..
# make -r -j4 # make -r -j4
sh config/boards/common_make.sh bash config/boards/common_make.sh

3
firmware/config/boards/kinetis/config/gen_config.sh
View File

@ -1,3 +1,4 @@
#!/bin/bash
# This batch files reads rusefi_config.txt and produses firmware persistent configuration headers # This batch files reads rusefi_config.txt and produses firmware persistent configuration headers
# the storage section of rusefi.ini is updated as well # the storage section of rusefi.ini is updated as well
@ -5,7 +6,7 @@ cd ../../../..
pwd pwd
sh gen_signature.sh kin bash gen_signature.sh kin
java \ java \
-DSystemOut.name=gen_config_kinetis_board \ -DSystemOut.name=gen_config_kinetis_board \

2
firmware/config/boards/kinetis/config/kinetis_gen_enum_to_string.sh
View File

@ -1,4 +1,4 @@
#!/bin/sh #!/bin/bash
cd ../../../.. cd ../../../..

2
firmware/config/boards/microrusefi/!compile_mre_f4.bat
View File

@ -1,2 +1,2 @@
@echo off @echo off
sh.exe compile_mre_f4.sh bash.exe compile_mre_f4.sh

2
firmware/config/boards/microrusefi/!compile_mre_f4_hardware_QC_special_build.bat
View File

@ -1,2 +1,2 @@
@echo off @echo off
sh.exe compile_mre_f4_hardware_QC_special_build.sh bash.exe compile_mre_f4_hardware_QC_special_build.sh

2
firmware/config/boards/microrusefi/!compile_mre_f4_slave.bat
View File

@ -1,2 +1,2 @@
@echo off @echo off
sh.exe compile_mre_f4_slave.sh bash.exe compile_mre_f4_slave.sh

2
firmware/config/boards/microrusefi/!compile_mre_f7.bat
View File

@ -1,2 +1,2 @@
@echo off @echo off
sh.exe compile_mre_f7.sh bash.exe compile_mre_f7.sh

2
firmware/config/boards/microrusefi/!compile_mre_f7_test.bat
View File

@ -1,2 +1,2 @@
@echo off @echo off
sh.exe compile_mre_f7_test.sh bash.exe compile_mre_f7_test.sh

4
firmware/config/boards/microrusefi/compile_mre_f4.sh
View File

@ -1,4 +1,4 @@
#!/bin/sh #!/bin/bash
cd ../../.. cd ../../..
@ -8,4 +8,4 @@ export EXTRA_PARAMS="-DSHORT_BOARD_NAME=mre_f4"
sh config/boards/common_make.sh bash config/boards/common_make.sh

4
firmware/config/boards/microrusefi/compile_mre_f4_hardware_QC_special_build.sh
View File

@ -1,4 +1,4 @@
#!/bin/sh #!/bin/bash
cd ../../.. cd ../../..
@ -8,6 +8,6 @@ export EXTRA_PARAMS="-DHW_CHECK_MODE=TRUE -DSHORT_BOARD_NAME=mre_f4"
export DEFAULT_ENGINE_TYPE=-DDEFAULT_ENGINE_TYPE=MRE_BOARD_NEW_TEST export DEFAULT_ENGINE_TYPE=-DDEFAULT_ENGINE_TYPE=MRE_BOARD_NEW_TEST
sh config/boards/common_make.sh bash config/boards/common_make.sh

4
firmware/config/boards/microrusefi/compile_mre_f4_slave.sh
View File

@ -1,4 +1,4 @@
#!/bin/sh #!/bin/bash
cd ../../.. cd ../../..
@ -8,6 +8,6 @@ export EXTRA_PARAMS=-DDUMMY -DEFI_CANBUS_SLAVE=TRUE -DSHORT_BOARD_NAME=mre_f4
export DEFAULT_ENGINE_TYPE = -DDEFAULT_ENGINE_TYPE=BMW_M73_MRE_SLAVE export DEFAULT_ENGINE_TYPE = -DDEFAULT_ENGINE_TYPE=BMW_M73_MRE_SLAVE
sh config/boards/common_make.sh bash config/boards/common_make.sh

4
firmware/config/boards/microrusefi/compile_mre_f7.sh
View File

@ -1,4 +1,4 @@
#!/bin/sh #!/bin/bash
cd ../../.. cd ../../..
@ -8,4 +8,4 @@ export EXTRA_PARAMS=-DSHORT_BOARD_NAME=mre_f7
export LDSCRIPT="config/boards/NUCLEO_F767/STM32F76xxI.ld" export LDSCRIPT="config/boards/NUCLEO_F767/STM32F76xxI.ld"
sh config/boards/common_make.sh bash config/boards/common_make.sh

4
firmware/config/boards/microrusefi/compile_mre_f7_test.sh
View File

@ -1,4 +1,4 @@
#!/bin/sh #!/bin/bash
cd ../../.. cd ../../..
@ -8,4 +8,4 @@ export EXTRA_PARAMS=-DSHORT_BOARD_NAME=mre_f7
export DEFAULT_ENGINE_TYPE="-DDEFAULT_ENGINE_TYPE=MRE_BOARD_TEST" export DEFAULT_ENGINE_TYPE="-DDEFAULT_ENGINE_TYPE=MRE_BOARD_TEST"
export LDSCRIPT="config/boards/NUCLEO_F767/STM32F76xxI.ld" export LDSCRIPT="config/boards/NUCLEO_F767/STM32F76xxI.ld"
sh config/boards/common_make.sh bash config/boards/common_make.sh

2
firmware/config/boards/nucleo_f746/!compile_stm32f746_nucleo.bat
View File

@ -1,2 +1,2 @@
@echo off @echo off
sh.exe compile_stm32f746_nucleo.sh bash.exe compile_stm32f746_nucleo.sh

4
firmware/config/boards/nucleo_f746/compile_stm32f746_nucleo.sh
View File

@ -1,4 +1,4 @@
#!/bin/sh #!/bin/bash
# STM32F767 version of the firmware for Nucleo-F746ZG board # STM32F767 version of the firmware for Nucleo-F746ZG board
@ -18,5 +18,5 @@ export EXTRA_PARAMS="-DDUMMY -DSTM32F746xx \
-DSTATUS_LOGGING_BUFFER_SIZE=1400 \ -DSTATUS_LOGGING_BUFFER_SIZE=1400 \
-DCCM_UNUSED_SIZE=10" -DCCM_UNUSED_SIZE=10"
export DEBUG_LEVEL_OPT="-O2" export DEBUG_LEVEL_OPT="-O2"
sh config/boards/common_make.sh bash config/boards/common_make.sh

2
firmware/config/boards/nucleo_f767/!compile_stm32f767_nucleo.bat
View File

@ -1,2 +1,2 @@
@echo off @echo off
sh.exe compile_stm32f767_nucleo.sh bash.exe compile_stm32f767_nucleo.sh

2
firmware/config/boards/nucleo_f767/!compile_stm32f767_osc.bat
View File

@ -1,2 +1,2 @@
@echo off @echo off
sh.exe compile_stm32f767_osc.sh bash.exe compile_stm32f767_osc.sh

4
firmware/config/boards/nucleo_f767/compile_stm32f767_nucleo.sh
View File

@ -1,4 +1,4 @@
#!/bin/sh #!/bin/bash
# STM32F767 version of the firmware for Nucleo-F767ZI board # STM32F767 version of the firmware for Nucleo-F767ZI board
@ -18,4 +18,4 @@ export EXTRA_PARAMS="-DDUMMY -DSTM32F767xx \
-DCH_DBG_ENABLE_CHECKS=FALSE -DCH_DBG_ENABLE_ASSERTS=FALSE -DCH_DBG_ENABLE_STACK_CHECK=FALSE -DCH_DBG_FILL_THREADS=FALSE -DCH_DBG_THREADS_PROFILING=FALSE" -DCH_DBG_ENABLE_CHECKS=FALSE -DCH_DBG_ENABLE_ASSERTS=FALSE -DCH_DBG_ENABLE_STACK_CHECK=FALSE -DCH_DBG_FILL_THREADS=FALSE -DCH_DBG_THREADS_PROFILING=FALSE"
export DEBUG_LEVEL_OPT="-O2" export DEBUG_LEVEL_OPT="-O2"
sh config/boards/common_make.sh bash config/boards/common_make.sh

4
firmware/config/boards/nucleo_f767/compile_stm32f767_osc.sh
View File

@ -1,4 +1,4 @@
#!/bin/sh #!/bin/bash
# STM32F767 version of the firmware for F767ZI chip NOT on Nucleo board, with a real oscilattor # STM32F767 version of the firmware for F767ZI chip NOT on Nucleo board, with a real oscilattor
@ -17,5 +17,5 @@ export EXTRA_PARAMS="-DDUMMY -DSTM32F767xx \
# Do not forget to comment out following line if looking to debug! # Do not forget to comment out following line if looking to debug!
export DEBUG_LEVEL_OPT="-O2" export DEBUG_LEVEL_OPT="-O2"
sh config/boards/common_make.sh bash config/boards/common_make.sh

2
firmware/config/boards/prometheus/!compile_prometheus_405.bat
View File

@ -1,2 +1,2 @@
@echo off @echo off
sh.exe compile_prometheus_405.sh bash.exe compile_prometheus_405.sh

2
firmware/config/boards/prometheus/!compile_prometheus_469.bat
View File

@ -1,2 +1,2 @@
@echo off @echo off
sh.exe compile_prometheus_469.sh bash.exe compile_prometheus_469.sh

4
firmware/config/boards/prometheus/compile_prometheus_405.sh
View File

@ -1,4 +1,4 @@
#!/bin/sh #!/bin/bash
# STM32F405 version of the firmware for https://rusefi.com/forum/viewtopic.php?f=4&t=1215 # STM32F405 version of the firmware for https://rusefi.com/forum/viewtopic.php?f=4&t=1215
@ -7,5 +7,5 @@ export PROJECT_BOARD=prometheus/f405
export EXTRA_PARAMS=-DSHORT_BOARD_NAME=prometheus_405 export EXTRA_PARAMS=-DSHORT_BOARD_NAME=prometheus_405
sh config/boards/common_make.sh bash config/boards/common_make.sh

4
firmware/config/boards/prometheus/compile_prometheus_469.sh
View File

@ -1,4 +1,4 @@
#!/bin/sh #!/bin/bash
# STM32F469 version of the firmware for https://rusefi.com/forum/viewtopic.php?f=4&t=1215 # STM32F469 version of the firmware for https://rusefi.com/forum/viewtopic.php?f=4&t=1215
@ -7,5 +7,5 @@ export PROJECT_BOARD=prometheus/f469
export EXTRA_PARAMS=-DSHORT_BOARD_NAME=prometheus_469 export EXTRA_PARAMS=-DSHORT_BOARD_NAME=prometheus_469
export USE_BOOTLOADER=yes export USE_BOOTLOADER=yes
sh config/boards/common_make.sh bash config/boards/common_make.sh

2
firmware/config/boards/proteus/!compile_proteus_f4.bat
View File

@ -1,2 +1,2 @@
@echo off @echo off
sh.exe compile_proteus_f4.sh bash.exe compile_proteus_f4.sh

2
firmware/config/boards/proteus/!compile_proteus_f7.bat
View File

@ -1,2 +1,2 @@
@echo off @echo off
sh.exe compile_proteus_f7.sh bash.exe compile_proteus_f7.sh

4
firmware/config/boards/proteus/compile_proteus_f4.sh
View File

@ -1,4 +1,4 @@
#!/bin/sh #!/bin/bash
cd ../../.. cd ../../..
@ -8,4 +8,4 @@ export EXTRA_PARAMS=-DSHORT_BOARD_NAME=proteus_f4
sh config/boards/common_make.sh bash config/boards/common_make.sh

4
firmware/config/boards/proteus/compile_proteus_f7.sh
View File

@ -1,4 +1,4 @@
#!/bin/sh #!/bin/bash
cd ../../.. cd ../../..
@ -8,4 +8,4 @@ export EXTRA_PARAMS=-DSHORT_BOARD_NAME=proteus_f7
export LDSCRIPT=config/boards/NUCLEO_F767/STM32F76xxI.ld export LDSCRIPT=config/boards/NUCLEO_F767/STM32F76xxI.ld
sh config/boards/common_make.sh bash config/boards/common_make.sh

2
firmware/flash_dfu.sh
View File

@ -1,4 +1,4 @@
#!/bin/sh #!/bin/bash
# This is a Linux/Unix script to do USB DFU (Device Firmware Update). # This is a Linux/Unix script to do USB DFU (Device Firmware Update).
# #
# The STM32 has multiple ways to write an application into the MCU. One is # The STM32 has multiple ways to write an application into the MCU. One is

2
firmware/flash_erase407.bat
View File

@ -1,2 +1,2 @@
@echo off @echo off
sh.exe flash_erase407.sh bash.exe flash_erase407.sh

2
firmware/flash_erase407.sh
View File

@ -1,4 +1,4 @@
#!/bin/sh #!/bin/bash
# st-link_cli -c SWD ur -ME # st-link_cli -c SWD ur -ME
# 0x100000 would erase both code and configuration # 0x100000 would erase both code and configuration

2
firmware/flash_openocd407.bat
View File

@ -1,2 +1,2 @@
@echo off @echo off
sh.exe flash_openocd407.sh bash.exe flash_openocd407.sh

2
firmware/flash_openocd407.sh
View File

@ -1,4 +1,4 @@
#!/bin/sh #!/bin/bash
echo "I am flash_openocd.sh" echo "I am flash_openocd.sh"

2
firmware/gen_config.bat
View File

@ -1,5 +1,5 @@
@echo off @echo off
sh.exe gen_config.sh bash.exe gen_config.sh
rem This would automatically copy latest file to 'dev' TS project rem This would automatically copy latest file to 'dev' TS project
set ts_path="%HOMEDRIVE%%HOMEPATH%\Documents\TunerStudioProjects" set ts_path="%HOMEDRIVE%%HOMEPATH%\Documents\TunerStudioProjects"

8
firmware/gen_config.sh
View File

@ -1,4 +1,4 @@
#!/bin/sh #!/bin/bash
#set -x #set -x
#TS_PATH="/home/<user>/TunerStudioProjects/" #TS_PATH="/home/<user>/TunerStudioProjects/"
@ -11,7 +11,7 @@ rm gen_config_board.log
mkdir build mkdir build
sh gen_signature.sh all bash gen_signature.sh all
java -DSystemOut.name=gen_config \ java -DSystemOut.name=gen_config \
-Drusefi.generator.lazyfile.enabled=true \ -Drusefi.generator.lazyfile.enabled=true \
@ -52,11 +52,11 @@ cp -v tunerstudio/generated/rusefi_mre_f4.ini $TS_PATH/mre_f4/projectCfg/mainCon
for BOARD in "microrusefi mre_f7" "microrusefi mre_f4" "frankenso frankenso_na6" "prometheus prometheus_469" "prometheus prometheus_405" "proteus proteus_f7" "proteus proteus_f4"; do for BOARD in "microrusefi mre_f7" "microrusefi mre_f4" "frankenso frankenso_na6" "prometheus prometheus_469" "prometheus prometheus_405" "proteus proteus_f7" "proteus proteus_f4"; do
BOARD_NAME="${BOARD% *}" BOARD_NAME="${BOARD% *}"
BOARD_SHORT_NAME="${BOARD#* }" BOARD_SHORT_NAME="${BOARD#* }"
sh gen_config_board.sh $BOARD_NAME $BOARD_SHORT_NAME bash gen_config_board.sh $BOARD_NAME $BOARD_SHORT_NAME
[ $? -eq 0 ] || { echo "ERROR generating board $BOARD_NAME $BOARD_SHORT_NAME"; exit 1; } [ $? -eq 0 ] || { echo "ERROR generating board $BOARD_NAME $BOARD_SHORT_NAME"; exit 1; }
done done
cd config/boards/kinetis/config cd config/boards/kinetis/config
sh gen_config.sh bash gen_config.sh
exit 0 exit 0

2
firmware/gen_config_board.bat
View File

@ -1,2 +1,2 @@
@echo off @echo off
sh.exe gen_config_board.sh bash.exe gen_config_board.sh

4
firmware/gen_config_board.sh
View File

@ -1,4 +1,4 @@
#!/bin/sh #!/bin/bash
# file gen_config_board.sh # file gen_config_board.sh
@ -17,7 +17,7 @@ SHORT_BOARDNAME=$2
echo "BOARDNAME=${BOARDNAME} SHORT_BOARDNAME=${SHORT_BOARDNAME}" echo "BOARDNAME=${BOARDNAME} SHORT_BOARDNAME=${SHORT_BOARDNAME}"
sh gen_signature.sh ${SHORT_BOARDNAME} bash gen_signature.sh ${SHORT_BOARDNAME}
java -DSystemOut.name=gen_config_board \ java -DSystemOut.name=gen_config_board \
-Drusefi.generator.lazyfile.enabled=true \ -Drusefi.generator.lazyfile.enabled=true \

2
firmware/gen_enum_to_string.bat
View File

@ -2,5 +2,5 @@ rem This batch files reads rusefi_enums.h and produses auto_generated_enums.* fi
rm gen_enum_to_string.log rm gen_enum_to_string.log
sh.exe gen_enum_to_string.sh bash.exe gen_enum_to_string.sh

4
firmware/gen_enum_to_string.sh
View File

@ -1,3 +1,5 @@
#!/bin/bash
echo "This batch files reads rusefi_enums.h and produses auto_generated_enums.* files" echo "This batch files reads rusefi_enums.h and produses auto_generated_enums.* files"
rm gen_enum_to_string.log rm gen_enum_to_string.log
@ -11,4 +13,4 @@ java -DSystemOut.name=gen_enum_to_string \
pwd pwd
cd config/boards/kinetis/config cd config/boards/kinetis/config
sh kinetis_gen_enum_to_string.sh bash kinetis_gen_enum_to_string.sh

2
firmware/gen_live_documentation.bat
View File

@ -1,2 +1,2 @@
@echo off @echo off
sh.exe gen_live_documentation.sh bash.exe gen_live_documentation.sh

2
firmware/gen_live_documentation.sh
View File

@ -1,4 +1,4 @@
#!/bin/sh #!/bin/bash
rm gen_live_documentation.log rm gen_live_documentation.log

2
firmware/update_version.bat
View File

@ -1,2 +1,2 @@
@echo off @echo off
sh.exe update_version.sh bash.exe update_version.sh

1
firmware/update_version.sh
View File

@ -1,3 +1,4 @@
#!/bin/bash
# Let's regenerate 'svnversion.h' # Let's regenerate 'svnversion.h'
# TODO: handle std err - for example, in case svn needs upgrade # TODO: handle std err - for example, in case svn needs upgrade

2
misc/jenkins/InteractiveHtmlBom/run.sh
View File

@ -1,4 +1,4 @@
#!/bin/sh #!/bin/bash
IBOM_CMD="python misc/InteractiveHtmlBom/generate_interactive_bom.py --no-browser --name-format \"%f_latest\" --dest-dir ../ibom" IBOM_CMD="python misc/InteractiveHtmlBom/generate_interactive_bom.py --no-browser --name-format \"%f_latest\" --dest-dir ../ibom"
echo "IBOM_CMD=$IBOM_CMD" echo "IBOM_CMD=$IBOM_CMD"

2
misc/jenkins/build_java_console.sh
View File

@ -1,4 +1,4 @@
#!/bin/sh #!/bin/bash
echo "java version" echo "java version"
java -version java -version

4
misc/jenkins/build_simulator.sh
View File

@ -1,4 +1,4 @@
#!/bin/sh #!/bin/bash
echo "TIMESTAMP $(date "+%D %T.%2N") Building rusefi simulator" echo "TIMESTAMP $(date "+%D %T.%2N") Building rusefi simulator"
pwd pwd
@ -8,7 +8,7 @@ make -v
mkdir -p out mkdir -p out
rm -rf build rm -rf build
rm -rf .dep rm -rf .dep
sh compile.sh bash compile.sh
ls build ls build
cd .. cd ..
[ -e simulator/build/rusefi_simulator.exe ] || { echo "SIMULATOR COMPILATION FAILED"; exit 1; } [ -e simulator/build/rusefi_simulator.exe ] || { echo "SIMULATOR COMPILATION FAILED"; exit 1; }

2
misc/jenkins/build_working_folder.sh
View File

@ -1,4 +1,4 @@
#!/bin/sh #!/bin/bash
FULL_BUNDLE_FILE="$BUNDLE_FULL_NAME.zip" FULL_BUNDLE_FILE="$BUNDLE_FULL_NAME.zip"
UPDATE_BUNDLE_FILE="${BUNDLE_FULL_NAME}_autoupdate.zip" UPDATE_BUNDLE_FILE="${BUNDLE_FULL_NAME}_autoupdate.zip"

8
misc/jenkins/compile_other_versions/compile_and_upload.sh
View File

@ -1,4 +1,4 @@
#!/bin/sh #!/bin/bash
# for example 'proteus' # for example 'proteus'
BOARD_NAME="$1" BOARD_NAME="$1"
@ -19,7 +19,7 @@ echo "Entering $SCRIPT_NAME with 1=$1 2=$2 3=$3 4=$4"
COMPILE_SCRIPT="compile_$BUNDLE_NAME.sh" COMPILE_SCRIPT="compile_$BUNDLE_NAME.sh"
cd firmware cd firmware
sh clean.sh bash clean.sh
cd .. cd ..
cd firmware/config/boards cd firmware/config/boards
@ -28,7 +28,7 @@ cd $BOARD_NAME
pwd pwd
echo "Invoking $COMPILE_SCRIPT" echo "Invoking $COMPILE_SCRIPT"
sh $COMPILE_SCRIPT bash $COMPILE_SCRIPT
[ -e ../../../build/rusefi.hex ] || { echo "Just to confirm - FAILED to compile with $COMPILE_SCRIPT"; exit 1; } [ -e ../../../build/rusefi.hex ] || { echo "Just to confirm - FAILED to compile with $COMPILE_SCRIPT"; exit 1; }
@ -36,6 +36,6 @@ cd ../../../..
# We are back at root rusEfi folder # We are back at root rusEfi folder
pwd pwd
sh misc/jenkins/compile_other_versions/prepare_bundle.sh bash misc/jenkins/compile_other_versions/prepare_bundle.sh
echo "exiting $SCRIPT_NAME" echo "exiting $SCRIPT_NAME"

4
misc/jenkins/compile_other_versions/prepare_bundle.sh
View File

@ -1,4 +1,4 @@
#!/bin/sh #!/bin/bash
SCRIPT_NAME="prepare_bundle.sh" SCRIPT_NAME="prepare_bundle.sh"
echo "Entering $SCRIPT_NAME with $BUNDLE_NAME" echo "Entering $SCRIPT_NAME with $BUNDLE_NAME"
@ -10,7 +10,7 @@ export FOLDER="temp/snapshot_${TIMESTAMP}_${BUNDLE_NAME}_rusefi"
export BUNDLE_FULL_NAME="rusefi_bundle_$BUNDLE_NAME" export BUNDLE_FULL_NAME="rusefi_bundle_$BUNDLE_NAME"
sh misc/jenkins/build_working_folder.sh bash misc/jenkins/build_working_folder.sh
pwd pwd
echo "exiting $SCRIPT_NAME" echo "exiting $SCRIPT_NAME"

20
misc/jenkins/functional_test_and_build_bundle/build_current_bundle.sh
View File

@ -1,4 +1,4 @@
#!/bin/sh #!/bin/bash
# This script would compile firmware, dev console and win32 simulator into a single bundle file # This script would compile firmware, dev console and win32 simulator into a single bundle file
# This script depends on Cygwin tools: zip # This script depends on Cygwin tools: zip
@ -13,8 +13,8 @@ date "+%a %D %T.%2S"
export BUNDLE_NAME="default" export BUNDLE_NAME="default"
cd firmware/bootloader cd firmware/bootloader
sh clean_bootloader.sh bash clean_bootloader.sh
sh compile_bootloader_discovery407.sh bash compile_bootloader_discovery407.sh
[ -e bootloader_generated.hxx ] || { echo "FAILED TO COMPILE BOOTLOADER"; exit 1; } [ -e bootloader_generated.hxx ] || { echo "FAILED TO COMPILE BOOTLOADER"; exit 1; }
pwd pwd
cd ../.. cd ../..
@ -26,14 +26,14 @@ date "+%a %D %T.%2S"
echo "$SCRIPT_NAME: will be Erasing chip" echo "$SCRIPT_NAME: will be Erasing chip"
[ -e flash_erase407.sh ] || { echo "NOT FOUND flash_erase.sh"; exit 1; } [ -e flash_erase407.sh ] || { echo "NOT FOUND flash_erase.sh"; exit 1; }
echo "$SCRIPT_NAME: Erasing chip" echo "$SCRIPT_NAME: Erasing chip"
sh flash_erase407.sh bash flash_erase407.sh
echo "$SCRIPT_NAME: Building firmware" echo "$SCRIPT_NAME: Building firmware"
sh clean.sh bash clean.sh
sh update_version.sh bash update_version.sh
sh clean_compile_two_versions.sh bash clean_compile_two_versions.sh
#[ -e deliver/rusefi_no_asserts.hex ] || { echo "Just to confirm - FAILED to compile no_asserts"; exit 1; } #[ -e deliver/rusefi_no_asserts.hex ] || { echo "Just to confirm - FAILED to compile no_asserts"; exit 1; }
[ -e deliver/rusefi.hex ] || { echo "Just to confirm - FAILED to compile default DEBUG"; exit 1; } [ -e deliver/rusefi.hex ] || { echo "Just to confirm - FAILED to compile default DEBUG"; exit 1; }
@ -55,10 +55,10 @@ cd ..
# At root folder here # At root folder here
sh misc/jenkins/build_java_console.sh bash misc/jenkins/build_java_console.sh
[ -e java_console_binary/rusefi_console.jar ] || { echo "rusefi_console.jar build FAILED"; exit 1; } [ -e java_console_binary/rusefi_console.jar ] || { echo "rusefi_console.jar build FAILED"; exit 1; }
sh misc/jenkins/build_simulator.sh bash misc/jenkins/build_simulator.sh
[ -e simulator/build/rusefi_simulator.exe ] || { echo "rusefi_simulator.exe build FAILED"; exit 1; } [ -e simulator/build/rusefi_simulator.exe ] || { echo "rusefi_simulator.exe build FAILED"; exit 1; }
STM_ARCH="stm32f407" STM_ARCH="stm32f407"
@ -71,7 +71,7 @@ echo "$SCRIPT_NAME: folder variable3=$FOLDER"
pwd pwd
export BUNDLE_FULL_NAME="rusefi_bundle" export BUNDLE_FULL_NAME="rusefi_bundle"
sh misc/jenkins/build_working_folder.sh bash misc/jenkins/build_working_folder.sh
[ $? -eq 0 ] || { echo "$SCRIPT_NAME: ERROR: invoking build_working_folder.sh"; exit 1; } [ $? -eq 0 ] || { echo "$SCRIPT_NAME: ERROR: invoking build_working_folder.sh"; exit 1; }

6
misc/jenkins/functional_test_and_build_bundle/hw_test.sh
View File

@ -1,4 +1,4 @@
#!/bin/sh #!/bin/bash
echo "TIMESTAMP $(date "+%a %D %T.%2S")" echo "TIMESTAMP $(date "+%a %D %T.%2S")"
SCRIPT_NAME="hw_test.sh" SCRIPT_NAME="hw_test.sh"
@ -7,10 +7,10 @@ pwd
cd firmware cd firmware
echo "$SCRIPT_NAME: erasing first" echo "$SCRIPT_NAME: erasing first"
sh flash_erase407.sh bash flash_erase407.sh
echo "$SCRIPT_NAME: trying to flash" echo "$SCRIPT_NAME: trying to flash"
# This script depends on someone else building firmware # This script depends on someone else building firmware
sh flash_openocd407.sh bash flash_openocd407.sh
[ $? -eq 0 ] || { echo "ERROR invoking flash_openocd407.sh"; exit 1; } [ $? -eq 0 ] || { echo "ERROR invoking flash_openocd407.sh"; exit 1; }
[ -e build/rusefi.bin ] || { echo "FIRMWARE NOT FOUND"; exit 1; } [ -e build/rusefi.bin ] || { echo "FIRMWARE NOT FOUND"; exit 1; }

6
misc/jenkins/functional_test_and_build_bundle/run.sh
View File

@ -1,9 +1,9 @@
#!/bin/sh #!/bin/bash
sh misc/jenkins/functional_test_and_build_bundle/build_current_bundle.sh bash misc/jenkins/functional_test_and_build_bundle/build_current_bundle.sh
[ $? -eq 0 ] || { echo "build ERROR DETECTED"; exit 1; } [ $? -eq 0 ] || { echo "build ERROR DETECTED"; exit 1; }
# sh misc/jenkins/functional_test_and_build_bundle/simulator_test.sh # bash misc/jenkins/functional_test_and_build_bundle/simulator_test.sh
# [ $? -eq 0 ] || { echo "simulator test ERROR DETECTED"; exit 1; } # [ $? -eq 0 ] || { echo "simulator test ERROR DETECTED"; exit 1; }
# Here we use last version of firmware produced by 'clean_compile_two_versions.bat' # Here we use last version of firmware produced by 'clean_compile_two_versions.bat'

2
misc/jenkins/functional_test_and_build_bundle/simulator_test.sh
View File

@ -1,4 +1,4 @@
#!/bin/sh #!/bin/bash
echo "I am simulator_test.sh" echo "I am simulator_test.sh"
pwd pwd

4
misc/jenkins/generate_doxygen/gen_upload_docs.sh
View File

@ -1,9 +1,9 @@
#!/bin/sh #!/bin/bash
echo "Should be executed from project root folder. Will try to upload to $RUSEFI_FTP_SERVER" echo "Should be executed from project root folder. Will try to upload to $RUSEFI_FTP_SERVER"
# ibom is part of Doxygen job simply in order to reduce workspace HDD usage on my tiny build server # ibom is part of Doxygen job simply in order to reduce workspace HDD usage on my tiny build server
sh misc/jenkins/InteractiveHtmlBom/run.sh bash misc/jenkins/InteractiveHtmlBom/run.sh
echo "Uploading IBOMs" echo "Uploading IBOMs"
ncftpput -R -v -u "$RUSEFI_DOXYGEN_FTP_USER" -p "$RUSEFI_DOXYGEN_FTP_PASS" "$RUSEFI_FTP_SERVER" /ibom hardware/ibom/* ncftpput -R -v -u "$RUSEFI_DOXYGEN_FTP_USER" -p "$RUSEFI_DOXYGEN_FTP_PASS" "$RUSEFI_FTP_SERVER" /ibom hardware/ibom/*

2
unit_tests/compile.sh
View File

@ -1,4 +1,4 @@
#!/bin/sh #!/bin/bash
echo "Compiling unit tests" echo "Compiling unit tests"
rm -rf .dep/ rm -rf .dep/