Mirrors/OpenSolo
1
0
Fork 0
mirror of https://github.com/OpenSolo/OpenSolo.git synced 2025-04-29 22:24:32 +02:00
Code Issues Packages Projects Releases Wiki Activity

BUILD: Move artoo build to beginning of script

Browse Source
This commit is contained in:
Matt Lawrence 2019-05-06 20:46:02 -04:00
parent b7c50e4ca4
commit f181e149ce
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
solo-builder/builder.sh
View File

@ -64,6 +64,15 @@ if ! $SCRIPT_MODE; then
echo echo
fi fi
## if -a arg is true, build the Artoo STM32 firmware and copy artoo.bin to the build.
if $ARTOO_BUILD; then
/vagrant/solo-builder/build_artoo.sh
if [ ! $? -eq 0 ]
then
exit 1
fi
fi
## Run source_sync.sh script to pull in build sources ## Run source_sync.sh script to pull in build sources
/vagrant/solo-builder/source_sync.sh /vagrant/solo-builder/source_sync.sh
if [ ! $? -eq 0 ]; then if [ ! $? -eq 0 ]; then
@ -126,15 +135,6 @@ if ! $CLEAN_BUILD; then
fi fi
fi fi
## if -a arg is true, build the Artoo STM32 firmware and copy artoo.bin to the build.
if $ARTOO_BUILD; then
/vagrant/solo-builder/build_artoo.sh
if [ ! $? -eq 0 ]
then
exit 1
fi
fi
## if -m arg is solo or both, build the Solo's IMX ## if -m arg is solo or both, build the Solo's IMX
if [ $MACHINE_BUILD = 'solo' ] || [ $MACHINE_BUILD = 'both' ]; then if [ $MACHINE_BUILD = 'solo' ] || [ $MACHINE_BUILD = 'both' ]; then