ios: Update 'Prepare for Distribution script'

to handle manual integration and integration via Cocoapods and Carthage.
plaid · Nov 2, 2017 · 4828eea · 4828eea
1 parent eabef7b
commit 4828eea
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 9 deletions.
diff --git a/ios/LinkDemo-ObjC/LinkDemo-ObjC.xcodeproj/project.pbxproj b/ios/LinkDemo-ObjC/LinkDemo-ObjC.xcodeproj/project.pbxproj
@@ -179,7 +179,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "cp \"${PROJECT_DIR}\"/../LinkKit.framework/prepare_for_distribution.sh \"${CODESIGNING_FOLDER_PATH}\"/Frameworks/LinkKit.framework/prepare_for_distribution.sh\n\"${CODESIGNING_FOLDER_PATH}\"/Frameworks/LinkKit.framework/prepare_for_distribution.sh\n";
+			shellScript = "LINK_ROOT=${PODS_ROOT:+$PODS_ROOT/Plaid/ios}\ncp \"${LINK_ROOT:-$PROJECT_DIR/..}\"/LinkKit.framework/prepare_for_distribution.sh \"${CODESIGNING_FOLDER_PATH}\"/Frameworks/LinkKit.framework/prepare_for_distribution.sh\n\"${CODESIGNING_FOLDER_PATH}\"/Frameworks/LinkKit.framework/prepare_for_distribution.sh\n";
 			showEnvVarsInLog = 0;
 		};
 /* End PBXShellScriptBuildPhase section */

diff --git a/ios/LinkDemo-Swift2/LinkDemo-Swift2.xcodeproj/project.pbxproj b/ios/LinkDemo-Swift2/LinkDemo-Swift2.xcodeproj/project.pbxproj
@@ -165,7 +165,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "cp \"${PROJECT_DIR}\"/../LinkKit.framework/prepare_for_distribution.sh \"${CODESIGNING_FOLDER_PATH}\"/Frameworks/LinkKit.framework/prepare_for_distribution.sh\n\"${CODESIGNING_FOLDER_PATH}\"/Frameworks/LinkKit.framework/prepare_for_distribution.sh\n";
+			shellScript = "LINK_ROOT=${PODS_ROOT:+$PODS_ROOT/Plaid/ios}\ncp \"${LINK_ROOT:-$PROJECT_DIR/..}\"/LinkKit.framework/prepare_for_distribution.sh \"${CODESIGNING_FOLDER_PATH}\"/Frameworks/LinkKit.framework/prepare_for_distribution.sh\n\"${CODESIGNING_FOLDER_PATH}\"/Frameworks/LinkKit.framework/prepare_for_distribution.sh\n";
 			showEnvVarsInLog = 0;
 		};
 /* End PBXShellScriptBuildPhase section */

diff --git a/ios/LinkDemo-Swift3/LinkDemo-Swift3.xcodeproj/project.pbxproj b/ios/LinkDemo-Swift3/LinkDemo-Swift3.xcodeproj/project.pbxproj
@@ -166,7 +166,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "cp \"${PROJECT_DIR}\"/../LinkKit.framework/prepare_for_distribution.sh \"${CODESIGNING_FOLDER_PATH}\"/Frameworks/LinkKit.framework/prepare_for_distribution.sh\n\"${CODESIGNING_FOLDER_PATH}\"/Frameworks/LinkKit.framework/prepare_for_distribution.sh\n";
+			shellScript = "LINK_ROOT=${PODS_ROOT:+$PODS_ROOT/Plaid/ios}\ncp \"${LINK_ROOT:-$PROJECT_DIR/..}\"/LinkKit.framework/prepare_for_distribution.sh \"${CODESIGNING_FOLDER_PATH}\"/Frameworks/LinkKit.framework/prepare_for_distribution.sh\n\"${CODESIGNING_FOLDER_PATH}\"/Frameworks/LinkKit.framework/prepare_for_distribution.sh\n";
 			showEnvVarsInLog = 0;
 		};
 /* End PBXShellScriptBuildPhase section */

diff --git a/ios/LinkDemo-Swift4/LinkDemo-Swift4.xcodeproj/project.pbxproj b/ios/LinkDemo-Swift4/LinkDemo-Swift4.xcodeproj/project.pbxproj
@@ -165,7 +165,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "cp \"${PROJECT_DIR}\"/../LinkKit.framework/prepare_for_distribution.sh \"${CODESIGNING_FOLDER_PATH}\"/Frameworks/LinkKit.framework/prepare_for_distribution.sh\n\"${CODESIGNING_FOLDER_PATH}\"/Frameworks/LinkKit.framework/prepare_for_distribution.sh\n";
+			shellScript = "LINK_ROOT=${PODS_ROOT:+$PODS_ROOT/Plaid/ios}\ncp \"${LINK_ROOT:-$PROJECT_DIR/..}\"/LinkKit.framework/prepare_for_distribution.sh \"${CODESIGNING_FOLDER_PATH}\"/Frameworks/LinkKit.framework/prepare_for_distribution.sh\n\"${CODESIGNING_FOLDER_PATH}\"/Frameworks/LinkKit.framework/prepare_for_distribution.sh\n";
 			showEnvVarsInLog = 0;
 		};
 /* End PBXShellScriptBuildPhase section */

diff --git a/ios/README.md b/ios/README.md
@@ -95,7 +95,7 @@ pod 'Plaid'
 * Add a **Run Script Build Phase** (we recommend naming it `Prepare for Distribution`) with the
   [script below](#user-content-prepare-distribution-script).
   Be sure that the `Prepare for Distribution` build phase runs _after_ the `Embed
-  Frameworks` build phase.
+  Frameworks` (or `[CP] Embed Pods Frameworks` when using Cocoapods) build phase.
   <br><img src='docs/images/setup/07-new_run_build_phase.jpg' width='350' title='Add new Run Script Build Phase'>
   <img src='docs/images/setup/08-edit_run_build_phase.jpg' width='350' title='Editing the `Prepare for Distribution` build phase'>
 
@@ -139,14 +139,16 @@ to `Carthage/Build/iOS/LinkKit.framework`
 
 <a name='prepare-distribution-script'></a>
 
-The scripts removes code from the framework, which included to support the iPhone Simulator,
+The scripts removes code from the framework, which is included to support the iPhone Simulator,
 but which may not be distributed via the App Store.
 
-Change the `${PROJECT_DIR}/LinkKit.framework` path in the example below according to your setup,
-and be sure to quote the filepaths when they contain whitespace.
+While the example below supports manual integration as well as integration via Cocoapods or
+Carthage, be sure to change the path to `${LINK_ROOT:-$PROJECT_DIR}"/LinkKit.framework/prepare_for_distribution.sh`
+according to your setup and quote the filepaths in case they contain whitespace.
 
 ```sh
-cp "${PROJECT_DIR}"/LinkKit.framework/prepare_for_distribution.sh "${CODESIGNING_FOLDER_PATH}"/Frameworks/LinkKit.framework/prepare_for_distribution.sh
+LINK_ROOT=${PODS_ROOT:+$PODS_ROOT/Plaid/ios}
+cp "${LINK_ROOT:-$PROJECT_DIR}"/LinkKit.framework/prepare_for_distribution.sh "${CODESIGNING_FOLDER_PATH}"/Frameworks/LinkKit.framework/prepare_for_distribution.sh
 "${CODESIGNING_FOLDER_PATH}"/Frameworks/LinkKit.framework/prepare_for_distribution.sh
 ```