From 2a48ba5dc0e0eb25da1a90a8a5df32a241b9180d Mon Sep 17 00:00:00 2001
From: M <m@cakewallet.com>
Date: Wed, 23 Feb 2022 15:04:45 +0200
Subject: [PATCH] iOS build scripts update

---
 ios/Runner/Runner.entitlements | 5 +----
 scripts/ios/app_icon_1024.png  | 1 -
 scripts/ios/app_icon_120.png   | 1 -
 scripts/ios/app_icon_180.png   | 1 -
 scripts/ios/build_deps.sh      | 1 +
 scripts/ios/build_haven.sh     | 1 -
 scripts/ios/build_haven_all.sh | 9 +++++++++
 scripts/ios/config.sh          | 2 +-
 8 files changed, 12 insertions(+), 9 deletions(-)
 delete mode 120000 scripts/ios/app_icon_1024.png
 delete mode 120000 scripts/ios/app_icon_120.png
 delete mode 120000 scripts/ios/app_icon_180.png
 create mode 100755 scripts/ios/build_haven_all.sh

diff --git a/ios/Runner/Runner.entitlements b/ios/Runner/Runner.entitlements
index 903def2af..0c67376eb 100644
--- a/ios/Runner/Runner.entitlements
+++ b/ios/Runner/Runner.entitlements
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
-<dict>
-	<key>aps-environment</key>
-	<string>development</string>
-</dict>
+<dict/>
 </plist>
diff --git a/scripts/ios/app_icon_1024.png b/scripts/ios/app_icon_1024.png
deleted file mode 120000
index 1d1e4ee5f..000000000
--- a/scripts/ios/app_icon_1024.png
+++ /dev/null
@@ -1 +0,0 @@
-/Users/m/Development/Projects/cake_wallet/scripts/ios/../../ios/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_1024.png
\ No newline at end of file
diff --git a/scripts/ios/app_icon_120.png b/scripts/ios/app_icon_120.png
deleted file mode 120000
index b3a4fa606..000000000
--- a/scripts/ios/app_icon_120.png
+++ /dev/null
@@ -1 +0,0 @@
-/Users/m/Development/Projects/cake_wallet/scripts/ios/../../ios/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_120.png
\ No newline at end of file
diff --git a/scripts/ios/app_icon_180.png b/scripts/ios/app_icon_180.png
deleted file mode 120000
index 426a03481..000000000
--- a/scripts/ios/app_icon_180.png
+++ /dev/null
@@ -1 +0,0 @@
-/Users/m/Development/Projects/cake_wallet/scripts/ios/../../ios/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_180.png
\ No newline at end of file
diff --git a/scripts/ios/build_deps.sh b/scripts/ios/build_deps.sh
index 141a7d00f..85c1f63b9 100755
--- a/scripts/ios/build_deps.sh
+++ b/scripts/ios/build_deps.sh
@@ -10,4 +10,5 @@ DIR=$(dirname "$0")
 case $APP_IOS_TYPE in
 	"monero.com") $DIR/build_monero_all.sh ;;
 	"cakewallet") $DIR/build_monero_all.sh ;;
+	"haven")      $DIR/build_haven_all.sh ;;
 esac
diff --git a/scripts/ios/build_haven.sh b/scripts/ios/build_haven.sh
index 8f38908d5..e3a05eee9 100755
--- a/scripts/ios/build_haven.sh
+++ b/scripts/ios/build_haven.sh
@@ -49,7 +49,6 @@ cmake -D IOS=ON \
     -DUSE_DEVICE_TREZOR=OFF \
 	../..
 make -j4 && make install
-#cp external/randomx/librandomx.a ${DEST_LIB}
 cp src/cryptonote_basic/libcryptonote_basic.a ${DEST_LIB}
 cp src/offshore/liboffshore.a ${DEST_LIB}
 popd
diff --git a/scripts/ios/build_haven_all.sh b/scripts/ios/build_haven_all.sh
new file mode 100755
index 000000000..116a30d25
--- /dev/null
+++ b/scripts/ios/build_haven_all.sh
@@ -0,0 +1,9 @@
+#!/bin/sh
+
+. ./config.sh
+./install_missing_headers.sh
+./build_openssl.sh
+./build_boost.sh
+./build_sodium.sh
+./build_zmq.sh
+./build_haven.sh
\ No newline at end of file
diff --git a/scripts/ios/config.sh b/scripts/ios/config.sh
index 128701469..22ce9d3e3 100755
--- a/scripts/ios/config.sh
+++ b/scripts/ios/config.sh
@@ -2,7 +2,7 @@
 
 export IOS_SCRIPTS_DIR=`pwd`
 export CW_ROOT=${IOS_SCRIPTS_DIR}/../..
-export EXTERNAL_DIR=${CW_ROOT}/cw_monero/ios/External
+export EXTERNAL_DIR=${CW_ROOT}/cw_shared_external/ios/External
 export EXTERNAL_IOS_DIR=${EXTERNAL_DIR}/ios
 export EXTERNAL_IOS_SOURCE_DIR=${EXTERNAL_IOS_DIR}/sources
 export EXTERNAL_IOS_LIB_DIR=${EXTERNAL_IOS_DIR}/lib