Merge pull request #621 from wix/DevFrameworkBuild

Internal: Add prod/dev awareness to scripts building Detox.framework for easier native development process
wix · Mar 14, 2018 · b62db86 · b62db86
2 parents fc34444 + 73393c3
commit b62db86
Show file tree

Hide file tree

Showing 8 changed files with 32 additions and 32 deletions.
diff --git a/detox/scripts/build_framework.ios.sh b/detox/scripts/build_framework.ios.sh
@@ -6,39 +6,52 @@ detoxVersion=`node -p "require('${detoxRootPath}/package.json').version"`
 sha1=`(echo "${detoxVersion}" && xcodebuild -version) | shasum | awk '{print $1}' #"${2}"`
 detoxFrameworkDirPath="$HOME/Library/Detox/ios/${sha1}"
 detoxFrameworkPath="${detoxFrameworkDirPath}/Detox.framework"
-detoxSourcePath="${detoxRootPath}"/ios_src
 
-function buildFramework {
-  echo "Extracting Detox sources..."
 
+function prepareAndBuildFramework () {
+  if [ -d "$detoxRootPath"/ios ]; then
+    detoxSourcePath="${detoxRootPath}"/ios
+    echo "Dev mode, will build from ${detoxSourcePath}"
+    buildFramework "${detoxSourcePath}"
+  else
+    detoxSourcePath="${detoxRootPath}"/ios_src
+    extractSources "${detoxSourcePath}"
+    buildFramework "${detoxSourcePath}"
+    rm -fr "${detoxSourcePath}"
+  fi
+}
+
+function extractSources () {
+  detoxSourcePath="${1}"
+  echo "Extracting Detox sources..."
   mkdir -p "${detoxSourcePath}"
   tar -xjf "${detoxRootPath}"/Detox-ios-src.tbz -C "${detoxSourcePath}"
+}
 
-  echo "Building Detox.framework..."
-
+function buildFramework () {
+  detoxSourcePath="${1}"
+  echo "Building Detox.framework from ${detoxSourcePath}..."
   mkdir -p "${detoxFrameworkDirPath}"
   xcodebuild build -project "${detoxSourcePath}"/Detox.xcodeproj -scheme DetoxFramework -configuration Release -derivedDataPath "${detoxFrameworkDirPath}"/DetoxBuild BUILD_DIR="${detoxFrameworkDirPath}"/DetoxBuild/Build/Products &> "${detoxFrameworkDirPath}"/detox_ios.log
   mv "${detoxFrameworkDirPath}"/DetoxBuild/Build/Products/Release-universal/Detox.framework "${detoxFrameworkDirPath}"
   rm -fr "${detoxFrameworkDirPath}"/DetoxBuild
-  rm -fr "${detoxSourcePath}"
-
-  echo "Done"
 }
 
-
-function main {
+function main () {
   if [ -d "${detoxFrameworkDirPath}" ]; then
     if [ ! -d "${detoxFrameworkPath}" ]; then
       echo "${detoxFrameworkDirPath} was found, but could not find Detox.framework inside it. This means that the Detox framework build process was interrupted.
          deleting ${detoxFrameworkDirPath} and trying to rebuild."
       rm -rf "${detoxFrameworkDirPath}"
-      buildFramework
+      prepareAndBuildFramework
     else
       echo "Detox.framework was previously compiled, skipping..."
     fi
   else
-    buildFramework
+    prepareAndBuildFramework
   fi
+
+  echo "Done"
 }
 
 main
diff --git a/detox/scripts/postinstall.sh b/detox/scripts/postinstall.sh
@@ -1,10 +1,5 @@
 #!/bin/bash -e
 
-if [ "$__DETOX_DEV" = true ]; then
-  echo "Running postinstall for detox dev mode, exiting"
-  exit 0
-fi
-
 if [ `uname` == "Darwin" ]; then
   source "$(dirname ${0})/build_framework.ios.sh"
 fi
diff --git a/docs/Guide.Contributing.md b/docs/Guide.Contributing.md
@@ -42,7 +42,7 @@ git submodule update --init --recursive
 ### Installing and linking internal projects
 
 ```sh
-scripts/bootstrap.sh
+lerna bootstrap
 ```
 
 ### Building

diff --git a/examples/demo-native-android/package.json b/examples/demo-native-android/package.json
@@ -8,8 +8,8 @@
     "e2e": "mocha e2e --opts ./e2e/mocha.opts"
   },
   "devDependencies": {
-    "mocha": "^3.2.0",
-    "detox": "^6.0.0"
+    "mocha": "^4.0.0",
+    "detox": "^7.0.0"
   },
   "detox": {}
 }
diff --git a/examples/demo-native-ios/package.json b/examples/demo-native-ios/package.json
@@ -3,8 +3,8 @@
 	"version": "0.0.1",
 	"private": true,
 	"devDependencies": {
-		"mocha": "^3.2.0",
-		"detox": "^6.0.0"
+		"mocha": "^4.0.0",
+		"detox": "^7.0.0"
 	},
 	"detox": {
 		"specs": "e2e",

diff --git a/scripts/bootstrap.sh b/scripts/bootstrap.sh
diff --git a/scripts/ci.sh b/scripts/ci.sh
@@ -6,7 +6,7 @@ if [ ! -z ${REACT_NATIVE_VERSION} ]; then
   node scripts/change_react_native_version.js "detox/test" ${REACT_NATIVE_VERSION}
 fi
 
-run_f "$(dirname "$0")/bootstrap.sh"
+run_f "lerna bootstrap"
 
 run_f "lerna run --ignore detox-demo* build"
 run_f "lerna run --ignore detox-demo* test"
diff --git a/scripts/demo-projects.ios.sh b/scripts/demo-projects.ios.sh
@@ -2,7 +2,7 @@
 
 source $(dirname "$0")/travis_logger.sh
 
-run_f "$(dirname "$0")/bootstrap.sh"
+run_f "lerna bootstrap"
 
 pushd examples/demo-react-native
 run_f "detox build -c ios.sim.release"