status-im
/
react-native
mirror of https://github.com/status-im/react-native.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix runIOS: appPath is hardcoded, read from log 

Summary:
The runIOS command currently assumes the path to the `xcodebuild` product - it's hardcoded

```
  const appPath = `build/Build/Products/Debug-iphonesimulator/${inferredSchemeName}.app`;
```
https://github.com/facebook/react-native/blob/master/local-cli/runIOS/runIOS.js#L87

This can be a problem, when you e.g. install a release version of the app to the simulator using the cli. We use a separate schema for that, which can be selected with `--scheme`.

This fix reads the output of the `xcodebuild` call and searches for the path and the name of the *.app file. If it's found, then it will be used to spawn in the simulator. If not, the default (as before) is used.
Closes https://github.com/facebook/react-native/pull/8250

Differential Revision: D3469074

Pulled By: javache

fbshipit-source-id: b10c7e6f48268b0c71dfcbfa661f8e5960c3aaa6
This commit is contained in:
Mark Oswald 2016-06-22 03:30:30 -07:00 committed by Facebook Github Bot 4
parent 3e4f16a2a6
commit 5276db492a
1 changed files with 35 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
local-cli/runIOS/runIOS.js
View File

@ -22,7 +22,6 @@ const Promise = require('promise');
function runIOS(argv, config) { function runIOS(argv, config) {
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
_runIOS(argv, config, resolve, reject); _runIOS(argv, config, resolve, reject);
resolve();
}); });
} }
@ -51,7 +50,7 @@ function _runIOS(argv, config, resolve, reject) {
process.chdir(args['project-path']); process.chdir(args['project-path']);
const xcodeProject = findXcodeProject(fs.readdirSync('.')); const xcodeProject = findXcodeProject(fs.readdirSync('.'));
if (!xcodeProject) { if (!xcodeProject) {
throw new Error(`Could not find Xcode project files in ios folder`); reject(new Error(`Could not find Xcode project files in ios folder`));
} }
const inferredSchemeName = path.basename(xcodeProject.name, path.extname(xcodeProject.name)); const inferredSchemeName = path.basename(xcodeProject.name, path.extname(xcodeProject.name));
@ -63,7 +62,7 @@ function _runIOS(argv, config, resolve, reject) {
); );
const selectedSimulator = matchingSimulator(simulators, args.simulator); const selectedSimulator = matchingSimulator(simulators, args.simulator);
if (!selectedSimulator) { if (!selectedSimulator) {
throw new Error(`Cound't find ${args.simulator} simulator`); reject(new Error(`Cound't find ${args.simulator} simulator`));
} }
const simulatorFullName = `${selectedSimulator.name} (${selectedSimulator.version})`; const simulatorFullName = `${selectedSimulator.name} (${selectedSimulator.version})`;
@ -82,20 +81,42 @@ function _runIOS(argv, config, resolve, reject) {
'-derivedDataPath', 'build', '-derivedDataPath', 'build',
]; ];
console.log(`Building using "xcodebuild ${xcodebuildArgs.join(' ')}"`); console.log(`Building using "xcodebuild ${xcodebuildArgs.join(' ')}"`);
child_process.spawnSync('xcodebuild', xcodebuildArgs, {stdio: 'inherit'});
const appPath = `build/Build/Products/Debug-iphonesimulator/${inferredSchemeName}.app`; let appPath = `build/Build/Products/Debug-iphonesimulator/${inferredSchemeName}.app`;
console.log(`Installing ${appPath}`); const xcodeBuildProcess = child_process.spawn('xcodebuild', xcodebuildArgs, {
child_process.spawnSync('xcrun', ['simctl', 'install', 'booted', appPath], {stdio: 'inherit'}); stdio: [process.stdin, 'pipe', process.stderr]
});
const bundleID = child_process.execFileSync( xcodeBuildProcess.stdout.on('data', (data) => {
'/usr/libexec/PlistBuddy', process.stdout.write(data);
['-c', 'Print:CFBundleIdentifier', path.join(appPath, 'Info.plist')],
{encoding: 'utf8'}
).trim();
console.log(`Launching ${bundleID}`); // search this part of the process output for a path to the generated app and replace default
child_process.spawnSync('xcrun', ['simctl', 'launch', 'booted', bundleID], {stdio: 'inherit'}); const appPathFromLog = data.toString().match(/Touch (build\/Build\/Products\/.*\/.*\.app)/);
if (appPathFromLog) {
appPath = appPathFromLog[1];
}
});
xcodeBuildProcess.on('close', (code) => {
if (code !== 0) {
reject(new Error(`xcodebuild process exited with code ${code}`));
return;
}
console.log(`Installing ${appPath}`);
child_process.spawnSync('xcrun', ['simctl', 'install', 'booted', appPath], {stdio: 'inherit'});
const bundleID = child_process.execFileSync(
'/usr/libexec/PlistBuddy',
['-c', 'Print:CFBundleIdentifier', path.join(appPath, 'Info.plist')],
{encoding: 'utf8'}
).trim();
console.log(`Launching ${bundleID}`);
child_process.spawnSync('xcrun', ['simctl', 'launch', 'booted', bundleID], {stdio: 'inherit'});
resolve();
});
} }
function matchingSimulator(simulators, simulatorName) { function matchingSimulator(simulators, simulatorName) {