From a68931d4c1281c74c86d43a60714fc06a87fb010 Mon Sep 17 00:00:00 2001
From: Edric Milaret <edric.ladent-milaret@savoirfairelinux.com>
Date: Tue, 5 Jul 2016 09:53:18 -0400
Subject: [PATCH] fix build script
Change-Id: Iab48c40d98c9c97c6a5bf67bb7c818b50d700b62
Tuleap: #313
---
compile-ios.sh | 20 +++++++++++++++-----
1 file changed, 15 insertions(+), 5 deletions(-)
diff --git a/compile-ios.sh b/compile-ios.sh
index 3f4eee9f8..412585059 100755
--- a/compile-ios.sh
+++ b/compile-ios.sh
@@ -63,11 +63,21 @@ CC="xcrun -sdk $SDK clang"
CXX="xcrun -sdk $SDK clang++"
IOS_TOP_DIR="$(pwd)"
-DAEMON_DIR="$(pwd)/../daemon"
-cd $DAEMON_DIR
-# TEMPORARY (until everything is merged)
-git fetch https://gerrit-ring.savoirfairelinux.com/ring-daemon refs/changes/38/4438/5 && git checkout FETCH_HEAD
+if [ -z "$DAEMON_DIR" ]; then
+ DAEMON_DIR="$(pwd)/../daemon"
+ echo "DAEMON_DIR not provided trying to find it in $DAEMON_DIR"
+fi
+if [ ! -d "$DAEMON_DIR" ]; then
+ echo 'Daemon not found.'
+ echo 'If you cloned the daemon in a custom location override' \
+ 'DAEMON_DIR to point to it'
+ echo "You can also use our meta repo which contains both:
+ https://gerrit-ring.savoirfairelinux.com/#/admin/projects/ring-project"
+ exit 1
+fi
+
+cd $DAEMON_DIR
for ARCH in "${ARCHS[@]}"
do
@@ -76,7 +86,7 @@ do
if test -z "$HOST"
then
- if $ARCH eq "arm64"
+ if [ "$ARCH" = "arm64" ]
then
HOST=aarch64-apple-darwin_ios
else
--
GitLab