Updated the otto.sh file to make all before trying to do anything else.
This commit is contained in:
parent
3e550f4ac5
commit
2ab9d8e18e
9
otto.sh
9
otto.sh
|
@ -177,6 +177,7 @@ build_hex () {
|
||||||
CMAKE_ARGS="${CMAKE_ARGS} -DCMAKE_TOOLCHAIN_FILE=${AVR_TC}"
|
CMAKE_ARGS="${CMAKE_ARGS} -DCMAKE_TOOLCHAIN_FILE=${AVR_TC}"
|
||||||
|
|
||||||
cmake ${CMAKE_ARGS} ../
|
cmake ${CMAKE_ARGS} ../
|
||||||
|
make all
|
||||||
make hex
|
make hex
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -187,9 +188,15 @@ build_hex_optimized () {
|
||||||
CMAKE_ARGS="${CMAKE_ARGS} -DCMAKE_TOOLCHAIN_FILE=${AVR_TC}"
|
CMAKE_ARGS="${CMAKE_ARGS} -DCMAKE_TOOLCHAIN_FILE=${AVR_TC}"
|
||||||
|
|
||||||
cmake ${CMAKE_ARGS} ../
|
cmake ${CMAKE_ARGS} ../
|
||||||
|
make all
|
||||||
make hex-release
|
make hex-release
|
||||||
}
|
}
|
||||||
|
|
||||||
|
flash_avr () {
|
||||||
|
build_hex_optimized
|
||||||
|
make upload
|
||||||
|
}
|
||||||
|
|
||||||
run_c_tests () {
|
run_c_tests () {
|
||||||
clear_cmake_cache
|
clear_cmake_cache
|
||||||
cmake -DUNIT_TESTING=ON -DCMAKE_VERBOSE_MAKEFILE=${CMAKE_VERBOSE} ../
|
cmake -DUNIT_TESTING=ON -DCMAKE_VERBOSE_MAKEFILE=${CMAKE_VERBOSE} ../
|
||||||
|
@ -235,7 +242,7 @@ main() {
|
||||||
4)
|
4)
|
||||||
echo "You selected Option 4"
|
echo "You selected Option 4"
|
||||||
valid_choice=true
|
valid_choice=true
|
||||||
cross_compile
|
flash_avr
|
||||||
;;
|
;;
|
||||||
5)
|
5)
|
||||||
echo "You selected Option 5"
|
echo "You selected Option 5"
|
||||||
|
|
Loading…
Reference in New Issue