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

Support Xcode projects with no schemes (#11750)

Browse Source
This commit is contained in:
Mikkel Nygaard Ravn 2017-08-23 11:58:21 +02:00 committed by GitHub
parent 9496e6dfa7
commit 32ab3dbee0
3 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dev/integration_tests/flavors/ios/Runner.xcodeproj/project.pbxproj
View File

@ -317,7 +317,6 @@
buildSettings = { buildSettings = {
ARCHS = arm64; ARCHS = arm64;
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
DEVELOPMENT_TEAM = AQ7UHDBEXJ;
ENABLE_BITCODE = NO; ENABLE_BITCODE = NO;
FRAMEWORK_SEARCH_PATHS = ( FRAMEWORK_SEARCH_PATHS = (
"$(inherited)", "$(inherited)",
@ -383,7 +382,6 @@
buildSettings = { buildSettings = {
ARCHS = arm64; ARCHS = arm64;
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
DEVELOPMENT_TEAM = AQ7UHDBEXJ;
ENABLE_BITCODE = NO; ENABLE_BITCODE = NO;
FRAMEWORK_SEARCH_PATHS = ( FRAMEWORK_SEARCH_PATHS = (
"$(inherited)", "$(inherited)",
@ -498,7 +496,6 @@
buildSettings = { buildSettings = {
ARCHS = arm64; ARCHS = arm64;
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
DEVELOPMENT_TEAM = AQ7UHDBEXJ;
ENABLE_BITCODE = NO; ENABLE_BITCODE = NO;
FRAMEWORK_SEARCH_PATHS = ( FRAMEWORK_SEARCH_PATHS = (
"$(inherited)", "$(inherited)",
@ -521,7 +518,6 @@
buildSettings = { buildSettings = {
ARCHS = arm64; ARCHS = arm64;
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
DEVELOPMENT_TEAM = AQ7UHDBEXJ;
ENABLE_BITCODE = NO; ENABLE_BITCODE = NO;
FRAMEWORK_SEARCH_PATHS = ( FRAMEWORK_SEARCH_PATHS = (
"$(inherited)", "$(inherited)",

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

@ -294,7 +294,6 @@ Future<XcodeBuildResult> buildXcodeProject({
'clean', 'clean',
'build', 'build',
'-configuration', configuration, '-configuration', configuration,
'-scheme', scheme,
'ONLY_ACTIVE_ARCH=YES', 'ONLY_ACTIVE_ARCH=YES',
]; ];
@ -306,6 +305,7 @@ Future<XcodeBuildResult> buildXcodeProject({
if (fs.path.extension(entity.path) == '.xcworkspace') { if (fs.path.extension(entity.path) == '.xcworkspace') {
commands.addAll(<String>[ commands.addAll(<String>[
'-workspace', fs.path.basename(entity.path), '-workspace', fs.path.basename(entity.path),
'-scheme', scheme,
"BUILD_DIR=${fs.path.absolute(getIosBuildDirectory())}", "BUILD_DIR=${fs.path.absolute(getIosBuildDirectory())}",
]); ]);
break; break;

2
packages/flutter_tools/lib/src/ios/xcodeproj.dart
View File

@ -119,6 +119,8 @@ class XcodeProjectInfo {
} }
collector?.add(line.trim()); collector?.add(line.trim());
} }
if (schemes.isEmpty)
schemes.add('Runner');
return new XcodeProjectInfo(targets, buildConfigurations, schemes); return new XcodeProjectInfo(targets, buildConfigurations, schemes);
} }