iOS: update build instractions

Updated INSTALL to point at packaging/ios/README
Updated README to 'facts'
Deleted ios_build_instructions as they are covered in README

[Dirk Hohndel: refactored Jan's original commit in #1241]

Signed-off-by: Jan Iversen <jani@apache.org>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>

3 files changed, 17 insertions, 55 deletions

diff --git a/INSTALL b/INSTALL
index 326ff8231..163e1e2dc 100644
--- a/INSTALL
+++ b/INSTALL
@@ -279,9 +279,13 @@ To install the app for all users, move subsurface/build/Subsurface.app to /Appli
 Cross-building Subsurface on MacOSX for iOS
 -------------------------------------------
 
-1) build SubSurface under MacOSX
-2) build as described in subsurface/packaging/ios
+1) build SubSurface under MacOSX and iOS
 
+1.1) cd <repo>/..; bash <repo>/scripts/build.sh -build-deps -both
+note: this is mainly done to ensure all external dependencies are downloaded and set
+      to the correct versions
+
+2) continue as described in subsurface/packaging/ios
 
 
 
diff --git a/packaging/ios/README b/packaging/ios/README
index a155768f6..d12729d37 100644
--- a/packaging/ios/README
+++ b/packaging/ios/README
@@ -1,36 +1,25 @@
 Tool repo to crosscompile subsurface for iOS
 --------------------------------------------
 
-The interaction between the different tools seems quite fragile.
-
 Dependencies:
 
 - This only works on a Mac
-- XCode with iOS SDK and Qt5.6 or later
+- XCode with iOS SDK and Qt5.9 or later
 - cmake
 
-Steps to install:
-
-Step 1.
-Install current XCode with the iOS SDK
-And QT for android from: http://qt-project.org/downloads, including the iOS bits
+Follow the instruction in:
+<repo>/INSTALL
 
-Step 2.
-Extract and install these into known directories.
-Have a look in the top of build.sh for where the cross build tool expects
-them. Create a symbolic link named Qt in this directory to point to the top
-of the Qt installation, e.g.
-ln -s ~/Qt5.7.1 Qt
+and then continue here:
 
-Step 3.
-Run bash build.sh in the terminal.
-The script will download and build the whole dependency chain, but not the actual
-Subsurface-mobile binary
+1) cd <repo>/packaging/ios
+2) ./build.sh
+note: this builds all dependencies and is only needed first time
+      it currently build for armv7 arm64 and x86_64 (simulator)
 
-Step 4.
-Launch the version of QtCreator that was installed in Step 2 above and open
-Subsurface-mobile/Subsurface-mobile.pro
-Build Subsurface-mobile in QtCreator - you can build for the simulator and for
+1) cd <repo>/..
+2) Launch QtCreator and open subsurface/packaging/ios/Subsurface-mobile/Subsurface-mobile.pro
+3) Build Subsurface-mobile in QtCreator - you can build for the simulator and for
 a device and even deploy to a connected device.
 
 Everything up to here you can do without paying for an Apple Developer account.
diff --git a/packaging/ios/ios_build_instructions b/packaging/ios/ios_build_instructions
deleted file mode 100644
index 46eef1ea3..000000000
--- a/packaging/ios/ios_build_instructions
+++ /dev/null
@@ -1,31 +0,0 @@
-Build instructions for iOS
-
-[since you have this file, you have already cloned subsurface. Great]
-
-Make sure, you have iOS packages for Qt installed (in my case 5.5 was sufficient).
-
-Get a developper account on developer.apple.com .
-
-Connect your phone, make sure XCode is seeing it in the Devices window. Open one of the
-sample iOS apps in XCode click the play button and follow the steps there to create a
-provisioning profile. Make sure the bundle Identifier is something like
-
-YOURNAME.subsurface-mobile
-
-Back in the shell
-
-> cd subsurface/packaging/ios
-> bash build.sh
-
-In Info.plist.In locate the key CFBundleIdentifier and change its value to
-
-YOURNAME.subsurface-mobile
-
-open QtCreator and there open Subsurface-mobile/Subsurface-mobile.pro
-
-select the Kit iphoneos-clang
-
-and press the play button. Have patience (you can watch the progress in the Compile Output
-window).
-
-Make sure the phone is unlocked. Tata!