From 3a206cf69c69d7c4163910a25a50323263089e70 Mon Sep 17 00:00:00 2001 From: Alexandre Lision <alexandre.lision@gmail.com> Date: Wed, 15 Oct 2014 12:18:51 -0400 Subject: [PATCH] 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. --- compile.sh | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/compile.sh b/compile.sh index 50961f612..6cdfa3081 100755 --- a/compile.sh +++ b/compile.sh @@ -119,7 +119,7 @@ then cd sflphone echo android/ >> .git/info/exclude echo contrib/android/ >> .git/info/exclude - git checkout master + git checkout $TESTED_HASH else echo "sflphone daemon source found" cd sflphone @@ -280,12 +280,13 @@ else echo "Configuring" echo `pwd` ${ANDROID_PATH}/configure.sh ${OPTS} - echo "Building" - make $MAKEFLAGS fi TARGET= fi +echo "Building libsflphone" +make $MAKEFLAGS + #################################### # Ring android UI and specific code #################################### -- GitLab