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

Merge pull request #4906 from collinjackson/fallback

Browse Source 
Fall back to the default xcodeproj if a workspace cannot be found
This commit is contained in:
Collin Jackson 2016-07-12 18:14:38 -07:00 committed by GitHub
commit 8891acc18a
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -123,11 +123,20 @@ Future<XcodeBuildResult> buildXcodeProject({
'build', 'build',
'-configuration', 'Release', '-configuration', 'Release',
'ONLY_ACTIVE_ARCH=YES', 'ONLY_ACTIVE_ARCH=YES',
'-workspace', 'Runner.xcworkspace',
'-scheme', 'Runner',
"BUILD_DIR=${path.absolute(app.rootPath, 'build')}",
]; ];
List<FileSystemEntity> contents = new Directory(app.rootPath).listSync();
for (FileSystemEntity entity in contents) {
if (path.extension(entity.path) == '.xcworkspace') {
commands.addAll(<String>[
'-workspace', path.basename(entity.path),
'-scheme', path.basenameWithoutExtension(entity.path),
"BUILD_DIR=${path.absolute(app.rootPath, 'build')}",
]);
break;
}
}
if (buildForDevice) { if (buildForDevice) {
commands.addAll(<String>['-sdk', 'iphoneos', '-arch', 'arm64']); commands.addAll(<String>['-sdk', 'iphoneos', '-arch', 'arm64']);
if (!codesign) { if (!codesign) {