From c462488391235459811d0189851dcbf938e79bb4 Mon Sep 17 00:00:00 2001 From: siepra Date: Mon, 16 Aug 2021 11:42:49 +0200 Subject: [PATCH] Fixed package name for ios build scripts --- scripts/ios-build-native-modules.sh | 4 ++-- scripts/ios-copy-nodejs-project.sh | 2 +- scripts/ios-sign-native-modules.sh | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/scripts/ios-build-native-modules.sh b/scripts/ios-build-native-modules.sh index ccd99aa..974396a 100644 --- a/scripts/ios-build-native-modules.sh +++ b/scripts/ios-build-native-modules.sh @@ -31,7 +31,7 @@ find "$CODESIGNING_FOLDER_PATH/nodejs-project/" -path "*/*.framework/*" -delete find "$CODESIGNING_FOLDER_PATH/nodejs-project/" -name "*.framework" -type d -delete # Apply patches to the modules package.json if [ -d "$CODESIGNING_FOLDER_PATH"/nodejs-project/node_modules/ ]; then - PATCH_SCRIPT_DIR="$( cd "$PROJECT_DIR" && cd ../node_modules/nodejs-mobile-react-native/scripts/ && pwd )" + PATCH_SCRIPT_DIR="$( cd "$PROJECT_DIR" && cd ../node_modules/zbayapp-nodejs-mobile-react-native/scripts/ && pwd )" NODEJS_PROJECT_MODULES_DIR="$( cd "$CODESIGNING_FOLDER_PATH" && cd nodejs-project/node_modules/ && pwd )" node "$PATCH_SCRIPT_DIR"/patch-package.js $NODEJS_PROJECT_MODULES_DIR fi @@ -39,7 +39,7 @@ fi if [ -d "$PROJECT_DIR/../node_modules/nodejs-mobile-gyp/" ]; then NODEJS_MOBILE_GYP_DIR="$( cd "$PROJECT_DIR" && cd ../node_modules/nodejs-mobile-gyp/ && pwd )" else - NODEJS_MOBILE_GYP_DIR="$( cd "$PROJECT_DIR" && cd ../node_modules/nodejs-mobile-react-native/node_modules/nodejs-mobile-gyp/ && pwd )" + NODEJS_MOBILE_GYP_DIR="$( cd "$PROJECT_DIR" && cd ../node_modules/zbayapp-nodejs-mobile-react-native/node_modules/nodejs-mobile-gyp/ && pwd )" fi NODEJS_MOBILE_GYP_BIN_FILE="$NODEJS_MOBILE_GYP_DIR"/bin/node-gyp.js # Support building neon-bindings (Rust) native modules diff --git a/scripts/ios-copy-nodejs-project.sh b/scripts/ios-copy-nodejs-project.sh index 602a151..db6000d 100644 --- a/scripts/ios-copy-nodejs-project.sh +++ b/scripts/ios-copy-nodejs-project.sh @@ -1,7 +1,7 @@ #!/bin/sh set -e NODEJS_ASSETS_DIR="$( cd "$PROJECT_DIR" && cd ../nodejs-assets/ && pwd )" -NODEJS_BUILT_IN_MODULES_DIR="$( cd "$PROJECT_DIR" && cd ../node_modules/nodejs-mobile-react-native/install/resources/nodejs-modules/ && pwd )" +NODEJS_BUILT_IN_MODULES_DIR="$( cd "$PROJECT_DIR" && cd ../node_modules/zbayapp-nodejs-mobile-react-native/install/resources/nodejs-modules/ && pwd )" if [ -d "$CODESIGNING_FOLDER_PATH/nodejs-project/" ] then rm -rf "$CODESIGNING_FOLDER_PATH/nodejs-project/" diff --git a/scripts/ios-sign-native-modules.sh b/scripts/ios-sign-native-modules.sh index b2cd0fc..41da4ec 100644 --- a/scripts/ios-sign-native-modules.sh +++ b/scripts/ios-sign-native-modules.sh @@ -24,7 +24,7 @@ if [ "1" != "$NODEJS_MOBILE_BUILD_NATIVE_MODULES" ]; then exit 0; fi find "$CODESIGNING_FOLDER_PATH/nodejs-project/" -name "*.o" -type f -delete find "$CODESIGNING_FOLDER_PATH/nodejs-project/" -name "*.a" -type f -delete # Create Info.plist for each framework built and loader override. -PATCH_SCRIPT_DIR="$( cd "$PROJECT_DIR" && cd ../node_modules/nodejs-mobile-react-native/scripts/ && pwd )" +PATCH_SCRIPT_DIR="$( cd "$PROJECT_DIR" && cd ../node_modules/zbayapp-nodejs-mobile-react-native/scripts/ && pwd )" NODEJS_PROJECT_DIR="$( cd "$CODESIGNING_FOLDER_PATH" && cd nodejs-project/ && pwd )" node "$PATCH_SCRIPT_DIR"/ios-create-plists-and-dlopen-override.js $NODEJS_PROJECT_DIR # Embed every resulting .framework in the application and delete them afterwards.