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

Revert "Lazily initialise Xcode installation status (#10945)" (#10951)

Browse Source 
This reverts commit bb8e2a7ccd46f8c4855391d6884b2a87c95267f6.

Triggers a doctor failure on the Mac chromebots.
This commit is contained in:
Chris Bracken 2017-06-23 16:08:36 -07:00 committed by GitHub
parent bb8e2a7ccd
commit 3e265e9e42
1 changed files with 39 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
packages/flutter_tools/lib/src/ios/mac.dart
View File

@ -80,58 +80,54 @@ class IMobileDevice {
} }
class Xcode { class Xcode {
bool get isInstalledAndMeetsVersionCheck => isInstalled && xcodeVersionSatisfactory; Xcode() {
_eulaSigned = false;
String _xcodeSelectPath;
String get xcodeSelectPath {
if (_xcodeSelectPath == null) {
try { try {
_xcodeSelectPath = runSync(<String>['/usr/bin/xcode-select', '--print-path'])?.trim(); _xcodeSelectPath = runSync(<String>['xcode-select', '--print-path'])?.trim();
} on ProcessException { if (_xcodeSelectPath == null || _xcodeSelectPath.isEmpty) {
// Ignore: return null below. _isInstalled = false;
} return;
}
return _xcodeSelectPath;
} }
_isInstalled = true;
bool get isInstalled { _xcodeVersionText = runSync(<String>['xcodebuild', '-version']).replaceAll('\n', ', ');
if (xcodeSelectPath == null || xcodeSelectPath.isEmpty)
return false;
if (!xcodeVersionRegex.hasMatch(xcodeVersionText))
return false;
return true;
}
bool _eulaSigned; if (!xcodeVersionRegex.hasMatch(_xcodeVersionText)) {
/// Has the EULA been signed? _isInstalled = false;
bool get eulaSigned { } else {
if (_eulaSigned == null) {
try { try {
final ProcessResult result = processManager.runSync(<String>['/usr/bin/xcrun', 'clang']); final ProcessResult result = processManager.runSync(<String>['/usr/bin/xcrun', 'clang']);
if (result.stdout != null && result.stdout.contains('license')) if (result.stdout != null && result.stdout.contains('license'))
_eulaSigned = false; _eulaSigned = false;
else if (result.stderr != null && result.stderr.contains('license')) else if (result.stderr != null && result.stderr.contains('license'))
_eulaSigned = false; _eulaSigned = false;
else else
_eulaSigned = true; _eulaSigned = true;
} on ProcessException { } catch (error) {
_eulaSigned = false; _eulaSigned = false;
} }
} }
return _eulaSigned; } catch (error) {
_isInstalled = false;
}
} }
bool get isInstalledAndMeetsVersionCheck => isInstalled && xcodeVersionSatisfactory;
String _xcodeSelectPath;
String get xcodeSelectPath => _xcodeSelectPath;
bool _isInstalled;
bool get isInstalled => _isInstalled;
bool _eulaSigned;
/// Has the EULA been signed?
bool get eulaSigned => _eulaSigned;
String _xcodeVersionText; String _xcodeVersionText;
String get xcodeVersionText { String get xcodeVersionText => _xcodeVersionText;
if (_xcodeVersionText != null) {
try {
_xcodeVersionText = runSync(<String>['/usr/bin/xcodebuild', '-version']).replaceAll('\n', ', ');
} on ProcessException {
// Ignore: return null below.
}
}
return _xcodeVersionText;
}
int _xcodeMajorVersion; int _xcodeMajorVersion;
int get xcodeMajorVersion => _xcodeMajorVersion; int get xcodeMajorVersion => _xcodeMajorVersion;