Skip to content
Snippets Groups Projects
Commit 3a206cf6 authored by Alexandre Lision's avatar Alexandre Lision
Browse files

compile.sh: checkout TESTED_HASH on first run (and not master)

There was also a corner case with sflphone compilation
We checked if config.h existed to compile daemon
What happened: if configuration is successfull but right after compilation crashed,
next time compilation was skipped.
Hack was to delete config.h, but that was really unclear. We now run make every time.
parent 31b4fbbc
Branches
No related tags found
No related merge requests found
...@@ -119,7 +119,7 @@ then ...@@ -119,7 +119,7 @@ then
cd sflphone cd sflphone
echo android/ >> .git/info/exclude echo android/ >> .git/info/exclude
echo contrib/android/ >> .git/info/exclude echo contrib/android/ >> .git/info/exclude
git checkout master git checkout $TESTED_HASH
else else
echo "sflphone daemon source found" echo "sflphone daemon source found"
cd sflphone cd sflphone
...@@ -280,12 +280,13 @@ else ...@@ -280,12 +280,13 @@ else
echo "Configuring" echo "Configuring"
echo `pwd` echo `pwd`
${ANDROID_PATH}/configure.sh ${OPTS} ${ANDROID_PATH}/configure.sh ${OPTS}
echo "Building"
make $MAKEFLAGS
fi fi
TARGET= TARGET=
fi fi
echo "Building libsflphone"
make $MAKEFLAGS
#################################### ####################################
# Ring android UI and specific code # Ring android UI and specific code
#################################### ####################################
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment