github/flutter
7
0
Fork 0
mirror of https://github.com/flutter/flutter.git synced 2025-06-03 00:51:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

check to see if the xcode eula has been signed

Browse Source
This commit is contained in:
Devon Carew 2016-02-21 00:41:14 -08:00
parent 4ec9608472
commit 16f9e38769
2 changed files with 31 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
packages/flutter_tools/lib/src/ios/ios_workflow.dart
View File

@ -28,15 +28,7 @@ class IOSWorkflow extends Workflow {
);
Function _xcodeExists = () {
if (xcode.isInstalledAndMeetsVersionCheck) {
return ValidationType.installed;
}
if (xcode.isInstalled) {
return ValidationType.partial;
}
return ValidationType.missing;
return xcode.isInstalled ? ValidationType.installed : ValidationType.missing;
};
Function _xcodeVersionSatisfactory = () {
@ -47,6 +39,10 @@ class IOSWorkflow extends Workflow {
return ValidationType.missing;
};
Function _xcodeEulaSigned = () {
return xcode.eulaSigned ? ValidationType.installed : ValidationType.missing;
};
Function _brewExists = () {
return exitsHappy(<String>['brew', '-v'])
? ValidationType.installed : ValidationType.missing;
@ -71,12 +67,19 @@ class IOSWorkflow extends Workflow {
iosValidator.addValidator(xcodeValidator);
xcodeValidator.addValidator(new Validator(
'Version Check',
description: 'Xcode version is at least $kXcodeRequiredVersionMajor.$kXcodeRequiredVersionMinor',
'version',
description: 'Xcode minimum version of $kXcodeRequiredVersionMajor.$kXcodeRequiredVersionMinor.0',
resolution: 'Download the latest version or update via the Mac App Store',
validatorFunction: _xcodeVersionSatisfactory
));
xcodeValidator.addValidator(new Validator(
'EULA',
description: 'XCode end user license agreement',
resolution: "Open XCode or run the command 'sudo xcodebuild -license'",
validatorFunction: _xcodeEulaSigned
));
Validator brewValidator = new Validator(
'brew',
description: 'install additional development packages',

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

@ -40,6 +40,23 @@ class XCode {
return _isInstalled;
}
/// Has the EULA been signed?
bool get eulaSigned {
if (!isInstalled)
return false;
try {
ProcessResult result = Process.runSync('/usr/bin/xcrun', <String>['clang']);
if (result.stdout != null && result.stdout.contains('license'))
return false;
if (result.stderr != null && result.stderr.contains('license'))
return false;
return true;
} catch (error) {
return false;
}
}
bool _xcodeVersionSatisfactory;
bool get xcodeVersionSatisfactory {
if (_xcodeVersionSatisfactory != null) {