Mercurial > hg > beaglert

comparison scripts/build_project.sh @ 465:67c45feec3c3 prerelease

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
And again.
author Robert Jack <robert.h.jack@gmail.com>
date Mon, 20 Jun 2016 16:27:07 +0100
parents 8fcfbfb32aa0
children c8dd56aed76d
comparison
equal deleted inserted replaced
464:8fcfbfb32aa0 465:67c45feec3c3
3 # This script compiles a Bela project on the BeagleBone Black and 3 # This script compiles a Bela project on the BeagleBone Black and
4 # optionally runs it. Pass a directory path in the first argument. 4 # optionally runs it. Pass a directory path in the first argument.
5 # The source files in this directory are copied to the board and compiled. 5 # The source files in this directory are copied to the board and compiled.
6 6
7 # set defaults unless variables are already set 7 # set defaults unless variables are already set
8 <<<<<<< mine
9 [ -z "$BBB_ADDRESS" ] && BBB_ADDRESS="root@192.168.7.2"
10 [ -z "$BBB_BELA_HOME" ] && BBB_BELA_HOME="~/Bela/"
11 [ -z "$BBB_SCREEN_NAME" ] && BBB_SCREEN_NAME="Bela"
12 [ -z "$RUN_PROJECT" ] && RUN_PROJECT=1
13 [ -z "$COMMAND_ARGS" ] && COMMAND_ARGS=
14 [ -z "$RUN_IN_FOREGROUND" ] && RUN_IN_FOREGROUND=1
15 [ -z "$RUN_WITHOUT_SCREEN" ] && RUN_WITHOUT_SCREEN=0
16 [ -z "$BBB_PROJECT_HOME" ] && BBB_PROJECT_HOME="${BBB_BELA_HOME}/projects/"
17 [ -z "$BBB_DEFAULT_PROJECT_NAME" ] && BBB_DEFAULT_PROJECT_NAME="scriptUploadedProject"
18 [ -z "$BBB_PROJECT_NAME" ] && BBB_PROJECT_NAME=$BBB_DEFAULT_PROJECT_NAME
19 =======
20 >>>>>>> theirs
21 8
22 SCRIPTDIR=$(dirname "$0") 9 SCRIPTDIR=$(dirname "$0")
23 [ -z $SCRIPTDIR ] && SCRIPTDIR="./" || SCRIPTDIR=$SCRIPTDIR/ 10 [ -z $SCRIPTDIR ] && SCRIPTDIR="./" || SCRIPTDIR=$SCRIPTDIR/
24 . $SCRIPTDIR.bela_common || { echo "You must be in Bela/scripts to run these scripts" | exit 1; } 11 . $SCRIPTDIR.bela_common || { echo "You must be in Bela/scripts to run these scripts" | exit 1; }
25 12