firka/flutter
firka/flutter
5
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #2402 from yjbanov/use-xcrun

Browse Source 
[ios] use xcrun to launch simulator instead of hardcoded path
This commit is contained in:
Yegor 2016-03-03 17:14:13 -08:00
commit cd0ddce963
1 changed files with 25 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
packages/flutter_tools/lib/src/ios/simulators.dart
View File

@ -21,9 +21,6 @@ import 'mac.dart';
const String _xcrunPath = '/usr/bin/xcrun'; const String _xcrunPath = '/usr/bin/xcrun';
const String _simulatorPath =
'/Applications/Xcode.app/Contents/Developer/Applications/Simulator.app/Contents/MacOS/Simulator';
class IOSSimulators extends PollingDeviceDiscovery { class IOSSimulators extends PollingDeviceDiscovery {
IOSSimulators() : super('IOSSimulators'); IOSSimulators() : super('IOSSimulators');
@ -56,33 +53,34 @@ class SimControl {
if (_isAnyConnected()) if (_isAnyConnected())
return true; return true;
if (deviceId == null) { if (deviceId == null)
runDetached([_simulatorPath]); deviceId = 'iPhone 6 (9.2)';
Future<bool> checkConnection([int attempts = 20]) async {
if (attempts == 0) { // `xcrun instruments` requires a template (-t). @yjbanov has no idea what
// "template" is but the built-in 'Blank' seems to work.
List<String> args = [_xcrunPath, 'instruments', '-w', deviceId, '-t', 'Blank'];
printTrace(args.join(' '));
runDetached(args);
printStatus('Waiting for iOS Simulator to boot...');
bool connected = false;
int attempted = 0;
while (!connected && attempted < 20) {
connected = await _isAnyConnected();
if (!connected) {
printStatus('Still waiting for iOS Simulator to boot...');
await new Future.delayed(new Duration(seconds: 1));
}
attempted++;
}
if (connected) {
printStatus('Connected to iOS Simulator.');
return true;
} else {
printStatus('Timed out waiting for iOS Simulator to boot.'); printStatus('Timed out waiting for iOS Simulator to boot.');
return false; return false;
} }
if (!_isAnyConnected()) {
printStatus('Waiting for iOS Simulator to boot...');
return await new Future.delayed(new Duration(milliseconds: 500),
() => checkConnection(attempts - 1)
);
}
return true;
}
return await checkConnection();
} else {
try {
runCheckedSync([_xcrunPath, 'simctl', 'boot', deviceId]);
return true;
} catch (e) {
printError('Unable to boot iOS Simulator $deviceId: ', e);
return false;
}
}
return false;
} }
/// Returns a list of all available devices, both potential and connected. /// Returns a list of all available devices, both potential and connected.