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

Re-land Lazily initialise Xcode installation status (#10952)

Browse Source 
This reverts commit 3e265e9e423392373a171be3d1303ebca1f4c7a4.

Rather than pre-compute Xcode install path, version, and EULA status,
compute and cache on demand.
This commit is contained in:
Chris Bracken 2017-06-23 16:58:14 -07:00 committed by GitHub
parent 3e265e9e42
commit 845c1b7f01
1 changed files with 44 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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