Преглед изворни кода

[iOS] Fix running in Debug mode on a device

Thsi fixed a regression in 8f75c2e279

The bundler script doesn't do anything (it literally exits right at the top)
when skipping the bundle. This is arguably wrong, because it doesn't generate
"ip.txt", the file with the bundler IP address either!

So, generate that ourselves. While ding this, also drop the need for xip.io,
which has also been removed from RN, since it gives more trouble than it solves.
master
Saúl Ibarra Corretgé пре 7 година
родитељ
комит
0d81e677bf
1 измењених фајлова са 1 додато и 1 уклоњено
  1. 1
    1
      ios/sdk/sdk.xcodeproj/project.pbxproj

+ 1
- 1
ios/sdk/sdk.xcodeproj/project.pbxproj Прегледај датотеку

337
 			);
337
 			);
338
 			runOnlyForDeploymentPostprocessing = 0;
338
 			runOnlyForDeploymentPostprocessing = 0;
339
 			shellPath = /bin/sh;
339
 			shellPath = /bin/sh;
340
-			shellScript = "export NODE_BINARY=node\nif [[ \"$CONFIGURATION\" == *Debug* ]]; then\n    export SKIP_BUNDLING=1\nfi\n../../node_modules/react-native/scripts/react-native-xcode.sh";
340
+			shellScript = "if [[ \"$CONFIGURATION\" == *Debug* && ! \"$PLATFORM_NAME\" == *simulator ]]; then\n    IP=$(ipconfig getifaddr en0)\n    if [ -z \"$IP\" ]; then\n        IP=$(ifconfig | grep 'inet ' | grep -v ' 127.' | cut -d\\   -f2  | awk 'NR==1{print $1}')\n    fi\n    DEST=$CONFIGURATION_BUILD_DIR/$UNLOCALIZED_RESOURCES_FOLDER_PATH\n    echo \"$IP\" > \"$DEST/ip.txt\"\n    exit 0\nfi\nexport NODE_BINARY=node\n../../node_modules/react-native/scripts/react-native-xcode.sh";
341
 		};
341
 		};
342
 		26796D8589142D80C8AFDA51 /* [CP] Check Pods Manifest.lock */ = {
342
 		26796D8589142D80C8AFDA51 /* [CP] Check Pods Manifest.lock */ = {
343
 			isa = PBXShellScriptBuildPhase;
343
 			isa = PBXShellScriptBuildPhase;

Loading…
Откажи
Сачувај