diff --git a/external/ios/build_boost.sh b/external/ios/build_boost.sh index e5a26893..4bfbfeb8 100755 --- a/external/ios/build_boost.sh +++ b/external/ios/build_boost.sh @@ -17,6 +17,7 @@ if [ -d "$BOOST_DIR_PATH" ]; then else echo "Cloning Boost from $BOOST_URL" mkdir -p $BOOST_DIR_PATH || true + rm -rf $BOOST_DIR_PATH || true cp -r "${MONEROC_DIR}/external/Apple-Boost-BuildScript" $BOOST_DIR_PATH fi cd $BOOST_DIR_PATH diff --git a/external/ios/build_monero_all.sh b/external/ios/build_monero_all.sh index 3f73933e..4957e692 100755 --- a/external/ios/build_monero_all.sh +++ b/external/ios/build_monero_all.sh @@ -5,6 +5,10 @@ set -e rm -rf build . ./config.sh + +rm -rf "$EXTERNAL_IOS_LIB_DIR" +rm -rf "$EXTERNAL_IOS_INCLUDE_DIR" + ./install_missing_headers.sh ./build_openssl.sh ./build_boost.sh diff --git a/external/ios/build_openssl.sh b/external/ios/build_openssl.sh index 3e898daf..507ca9d3 100755 --- a/external/ios/build_openssl.sh +++ b/external/ios/build_openssl.sh @@ -15,12 +15,14 @@ if [ -d "$OPEN_SSL_DIR_PATH" ]; then echo "OpenSSL directory already exists." else mkdir -p "$OPEN_SSL_DIR_PATH" || true + rm -rf "$OPEN_SSL_DIR_PATH" cp -r "${MONEROC_DIR}/external/OpenSSL-for-iPhone" $OPEN_SSL_DIR_PATH fi cd $OPEN_SSL_DIR_PATH ./build-libssl.sh --version=1.1.1q --targets="ios-cross-arm64" --deprecated + mv -f ${OPEN_SSL_DIR_PATH}/include/* $EXTERNAL_IOS_INCLUDE_DIR -mv ${OPEN_SSL_DIR_PATH}/lib/libcrypto-iOS.a ${EXTERNAL_IOS_LIB_DIR}/libcrypto.a -mv ${OPEN_SSL_DIR_PATH}/lib/libssl-iOS.a ${EXTERNAL_IOS_LIB_DIR}/libssl.a \ No newline at end of file +mv -f ${OPEN_SSL_DIR_PATH}/lib/libcrypto-iOS.a ${EXTERNAL_IOS_LIB_DIR}/libcrypto.a +mv -f ${OPEN_SSL_DIR_PATH}/lib/libssl-iOS.a ${EXTERNAL_IOS_LIB_DIR}/libssl.a \ No newline at end of file diff --git a/external/ios/build_sodium.sh b/external/ios/build_sodium.sh index ab874264..ecb4a5e0 100755 --- a/external/ios/build_sodium.sh +++ b/external/ios/build_sodium.sh @@ -17,9 +17,11 @@ if [ -d "$SODIUM_PATH" ]; then else echo "Cloning Sodium from $SODIUM_URL" mkdir -p $SODIUM_PATH || true + rm -rf $SODIUM_PATH cp -r "${MONEROC_DIR}/external/libsodium" $SODIUM_PATH fi +cd $SODIUM_PATH ../../../../libsodium_apple-ios.sh mv -f ${SODIUM_PATH}/libsodium-apple/ios/include/* $EXTERNAL_IOS_INCLUDE_DIR diff --git a/external/ios/build_unbound.sh b/external/ios/build_unbound.sh index 893db69c..14efef80 100755 --- a/external/ios/build_unbound.sh +++ b/external/ios/build_unbound.sh @@ -19,6 +19,7 @@ if [ -d "$UNBOUND_DIR_PATH" ]; then else echo "Cloning Unbound from $Unbound_URL" mkdir -p ${UNBOUND_DIR_PATH} || true + rm -rf ${UNBOUND_DIR_PATH} cp -r "${MONEROC_DIR}/external/unbound" ${UNBOUND_DIR_PATH} fi diff --git a/external/ios/build_wownero_seed.sh b/external/ios/build_wownero_seed.sh index 81900ff6..7672db53 100755 --- a/external/ios/build_wownero_seed.sh +++ b/external/ios/build_wownero_seed.sh @@ -10,8 +10,8 @@ SEED_SRC_DIR="${EXTERNAL_IOS_SOURCE_DIR}/seed" rm -rf "$SEED_SRC_DIR" > /dev/null echo "[*] cloning $SEED_URL" -rm -rf ${SEED_SRC_DIR} || true mkdir -p ${SEED_SRC_DIR} || true +rm -rf ${SEED_SRC_DIR} cp -r "${MONEROC_DIR}/external/wownero-seed" ${SEED_SRC_DIR} cd $SEED_SRC_DIR diff --git a/external/ios/build_zmq.sh b/external/ios/build_zmq.sh index 8cf379b1..63306b20 100755 --- a/external/ios/build_zmq.sh +++ b/external/ios/build_zmq.sh @@ -16,6 +16,7 @@ if [ -d "$ZMQ_PATH" ]; then else echo "Cloning ZeroMQ from $ZeroMQ_URL" mkdir -p $ZMQ_PATH || true + rm -rf $ZMQ_PATH cp -r "${MONEROC_DIR}/external/libzmq" $ZMQ_PATH fi