Update build for monero and haven

cw_haven/android/CMakeLists.txt

@@ -6,7 +6,7 @@ add_library( cw_haven
 
              find_library( log-lib log )
 
-set(EXTERNAL_LIBS_DIR ${CMAKE_SOURCE_DIR}/../ios/External/android)
+set(EXTERNAL_LIBS_DIR ${CMAKE_SOURCE_DIR}/../../cw_shared_external/ios/External/android)
 
 ############
 # libsodium

cw_monero/android/CMakeLists.txt

@@ -7,7 +7,7 @@ add_library( cw_monero
 
              find_library( log-lib log )
 
-set(EXTERNAL_LIBS_DIR ${CMAKE_SOURCE_DIR}/../ios/External/android)
+set(EXTERNAL_LIBS_DIR ${CMAKE_SOURCE_DIR}/../../cw_shared_external/ios/External/android)
 
 ############
 # libsodium

scripts/ios/build_haven.sh

@@ -7,6 +7,8 @@ HAVEN_DIR_PATH="${EXTERNAL_IOS_SOURCE_DIR}/haven"
 HAVEN_VERSION=tags/v2.2.2
 BUILD_TYPE=release
 PREFIX=${EXTERNAL_IOS_DIR}
+DEST_LIB_DIR=${EXTERNAL_IOS_LIB_DIR}/haven
+DEST_INCLUDE_DIR=${EXTERNAL_IOS_INCLUDE_DIR}/haven
 
 echo "Cloning haven from - $HAVEN_URL to - $HAVEN_DIR_PATH"		
 git clone $HAVEN_URL $HAVEN_DIR_PATH
@@ -55,8 +57,8 @@ popd
 
 done
 
-mkdir -p $EXTERNAL_IOS_LIB_DIR/haven
-mkdir -p $EXTERNAL_IOS_INCLUDE_DIR/haven
 #only for arm64
-cp ${HAVEN_DIR_PATH}/lib-armv8-a/* $EXTERNAL_IOS_LIB_DIR/haven
-cp ${HAVEN_DIR_PATH}/include/wallet/api/* $EXTERNAL_IOS_INCLUDE_DIR/haven
+mkdir -p $DEST_LIB_DIR
+mkdir -p $DEST_INCLUDE_DIR
+cp ${HAVEN_DIR_PATH}/lib-armv8-a/* $DEST_LIB_DIR
+cp ${HAVEN_DIR_PATH}/include/wallet/api/* $DEST_INCLUDE_DIR

scripts/ios/build_monero.sh

@@ -7,6 +7,8 @@ MONERO_DIR_PATH="${EXTERNAL_IOS_SOURCE_DIR}/monero"
 MONERO_VERSION=tags/v0.17.3.0
 BUILD_TYPE=release
 PREFIX=${EXTERNAL_IOS_DIR}
+DEST_LIB_DIR=${EXTERNAL_IOS_LIB_DIR}/monero
+DEST_INCLUDE_DIR=${EXTERNAL_IOS_INCLUDE_DIR}/monero
 
 echo "Cloning monero from - $MONERO_URL to - $MONERO_DIR_PATH"		
 git clone $MONERO_URL $MONERO_DIR_PATH
@@ -57,5 +59,7 @@ popd
 done
 
 #only for arm64
-cp ${MONERO_DIR_PATH}/lib-armv8-a/* $EXTERNAL_IOS_LIB_DIR
-cp ${MONERO_DIR_PATH}/include/wallet/api/* $EXTERNAL_IOS_INCLUDE_DIR
+mkdir -p $DEST_LIB_DIR
+mkdir -p $DEST_INCLUDE_DIR
+cp ${MONERO_DIR_PATH}/lib-armv8-a/* $DEST_LIB_DIR
+cp ${MONERO_DIR_PATH}/include/wallet/api/* $DEST_INCLUDE_DIR

scripts/ios/setup.sh

@@ -7,23 +7,25 @@ libtool -static -o libboost.a ./boost/*.a
 libtool -static -o libhaven.a ./haven/*.a
 libtool -static -o libmonero.a ./monero/*.a
 
-CW_HAVEN_EXTERNAL_LIB=../../../cw_haven/ios/External/ios/lib
-CW_HAVEN_EXTERNAL_INCLUDE=../../../cw_haven/ios/External/ios/include
-CW_MONERO_EXTERNAL=../../../cw_haven/ios/External/ios/lib
+CW_HAVEN_EXTERNAL_LIB=../../../../../cw_haven/ios/External/ios/lib
+CW_HAVEN_EXTERNAL_INCLUDE=../../../../../cw_haven/ios/External/ios/include
+CW_MONERO_EXTERNAL_LIB=../../../../../cw_monero/ios/External/ios/lib
+CW_MONERO_EXTERNAL_INCLUDE=../../../../../cw_monero/ios/External/ios/include
 
 mkdir -p $CW_HAVEN_EXTERNAL_INCLUDE
 mkdir -p $CW_HAVEN_EXTERNAL_LIB
-mkdir -p $CW_MONERO_EXTERNAL
+mkdir -p $CW_MONERO_EXTERNAL_LIB
 
-ln -s ./libboost.a $CW_HAVEN_EXTERNAL_LIB
-ln -s ./libcrypto.a $CW_HAVEN_EXTERNAL_LIB
-ln -s ./libssl.a $CW_HAVEN_EXTERNAL_LIB
-ln -s ./libsodium.a $CW_HAVEN_EXTERNAL_LIB
+ln ./libboost.a ${CW_HAVEN_EXTERNAL_LIB}/libboost.a
+ln ./libcrypto.a ${CW_HAVEN_EXTERNAL_LIB}/libcrypto.a
+ln ./libssl.a ${CW_HAVEN_EXTERNAL_LIB}/libssl.a
+ln ./libsodium.a ${CW_HAVEN_EXTERNAL_LIB}/libsodium.a
 cp ./libhaven.a $CW_HAVEN_EXTERNAL_LIB
 cp ../include/haven/* $CW_HAVEN_EXTERNAL_INCLUDE
 
-#ln -s ./libboost.a $CW_HAVEN_EXTERNAL_LIB
-#ln -s ./libcrypto.a $CW_HAVEN_EXTERNAL_LIB
-#ln -s ./libssl.a $CW_HAVEN_EXTERNAL_LIB
-#ln -s ./libsodium.a $CW_HAVEN_EXTERNAL_LIB
-#cp ./libhaven.a $CW_HAVEN_EXTERNAL_LIB
+ln ./libboost.a ${CW_MONERO_EXTERNAL_LIB}/libboost.a
+ln ./libcrypto.a ${CW_MONERO_EXTERNAL_LIB}/libcrypto.a
+ln ./libssl.a ${CW_MONERO_EXTERNAL_LIB}/libssl.a
+ln ./libsodium.a ${CW_MONERO_EXTERNAL_LIB}/libsodium.a
+cp ./libmonero.a $CW_MONERO_EXTERNAL_LIB
+cp ../include/monero/* $CW_MONERO_EXTERNAL_INCLUDE