From dca37f00ec92afe836813c03bdc013dacc13672b Mon Sep 17 00:00:00 2001
From: Romain Bertozzi <romain.bertozzi@savoirfairelinux.com>
Date: Tue, 7 Nov 2017 14:08:02 -0500
Subject: [PATCH] make-ring.py: support iOS installation
This commit adds the support for the iOS platform in the installation
instruction.
Until now, ./make-ring --install --distribution iOS did not work as
expected and triggered a non-working compilation.
Tuleap: #1745
Change-Id: Ic181e280dbcf4ea4713d5cef38f4fdf5c710b570
---
make-ring.py | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/make-ring.py b/make-ring.py
index bbc70b92..9fd6bf0c 100755
--- a/make-ring.py
+++ b/make-ring.py
@@ -15,6 +15,8 @@ import platform
import multiprocessing
import shutil
+IOS_DISTRIBUTION_NAME="iOS"
+
DEBIAN_BASED_DISTROS = [
'Debian',
'Ubuntu',
@@ -234,7 +236,7 @@ def run_dependencies(args):
{"packages": ' '.join(OSX_DEPENDENCIES)}
)
- elif args.distribution == "iOS":
+ elif args.distribution == IOS_DISTRIBUTION_NAME:
execute_script(
BREW_UNLINK_SCRIPT,
{"packages": ' '.join(IOS_DEPENDENCIES_UNLINK)}
@@ -288,6 +290,9 @@ def run_install(args):
os.environ['CMAKE_PREFIX_PATH'] = str(qt5dir.decode('ascii'))
install_args += " -c client-macosx"
execute_script(["CONFIGURE_FLAGS='--without-dbus' ./scripts/install.sh " + install_args])
+ elif args.distribution == IOS_DISTRIBUTION_NAME:
+ os.chdir("./client-ios")
+ execute_script(["./compile-ios.sh"])
elif args.distribution == "Android":
os.chdir("./client-android")
execute_script(["./compile.sh"])
@@ -398,7 +403,7 @@ def validate_args(parsed_args):
"""Validate the args values, exit if error is found"""
# Check arg values
- supported_distros = ['Android', 'Ubuntu', 'Debian', 'OSX', 'iOS', 'Fedora', 'Arch Linux', 'openSUSE', 'Automatic', 'mingw32', 'mingw64']
+ supported_distros = ['Android', 'Ubuntu', 'Debian', 'OSX', IOS_DISTRIBUTION_NAME, 'Fedora', 'Arch Linux', 'openSUSE', 'Automatic', 'mingw32', 'mingw64']
if parsed_args.distribution not in supported_distros:
print('Distribution \''+parsed_args.distribution+'\' not supported.\nChoose one of: %s' \
--
GitLab