mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2024-11-30 22:20:21 +00:00
Code Issues Projects Releases Packages Wiki Activity

build.sh: fix logic when to build grantlee

Browse source 
Grmbl. SUBSURFACE_EXECUTABLE now doesn't get set until later in the
script. So let's just trigger this explicitly.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Dirk Hohndel 2016-01-22 10:15:51 -08:00
parent 451293f1a0
commit 60115821a5
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
scripts/build.sh
View file

@ -26,7 +26,7 @@ PLATFORM=$(uname)
# normally this script builds the desktop version in subsurface/build # normally this script builds the desktop version in subsurface/build
# if the first argument is "-mobile" then build Subsurface-mobile in subsurface/build-mobile # if the first argument is "-mobile" then build Subsurface-mobile in subsurface/build-mobile
# if the first argument is "-both" then build both in subsurface/build and subsurface/build-mobile # if the first argument is "-both" then build both in subsurface/build and subsurface/build-mobile
BUILD="Desktop" BUILDGRANTLEE=0
if [ "$1" = "-mobile" ] ; then if [ "$1" = "-mobile" ] ; then
echo "building Subsurface-mobile in subsurface/build-mobile" echo "building Subsurface-mobile in subsurface/build-mobile"
BUILDS=( "MobileExecutable" ) BUILDS=( "MobileExecutable" )
@ -36,11 +36,13 @@ elif [ "$1" = "-both" ] ; then
echo "building both Subsurface and Subsurface-mobile in subsurface/build and subsurface/build-mobile, respectively" echo "building both Subsurface and Subsurface-mobile in subsurface/build and subsurface/build-mobile, respectively"
BUILDS=( "DesktopExecutable" "MobileExecutable" ) BUILDS=( "DesktopExecutable" "MobileExecutable" )
BUILDDIRS=( "build" "build-mobile" ) BUILDDIRS=( "build" "build-mobile" )
BUILDGRANTLEE=1
shift shift
else else
echo "building Subsurface in subsurface/build" echo "building Subsurface in subsurface/build"
BUILDS=( "DesktopExecutable" ) BUILDS=( "DesktopExecutable" )
BUILDDIRS=( "build" ) BUILDDIRS=( "build" )
BUILDGRANTLEE=1
fi fi
if [[ ! -d "subsurface" ]] ; then if [[ ! -d "subsurface" ]] ; then
@ -156,7 +158,7 @@ if [ $PLATFORM = Darwin ] ; then
fi fi
fi fi
if [ "$SUBSURFACE_EXECUTABLE" = "DesktopExecutable" ] ; then if [ "$BUILDGRANTLEE" = "1" ] ; then
# build grantlee # build grantlee
cd $SRC cd $SRC