Commit b930f0d4 authored by Chinmay Garde's avatar Chinmay Garde

Update engine and temporarily get rid of custom build directories in `flutter build ios`

parent 0213b67e
893425d96046e413e643d5de380dfaa2cc5725ed ed3014b3d337d025393bd894ffa2897e05d43e91
...@@ -52,20 +52,15 @@ class BuildIOSCommand extends FlutterCommand { ...@@ -52,20 +52,15 @@ class BuildIOSCommand extends FlutterCommand {
printStatus('Building the application for $logTarget.'); printStatus('Building the application for $logTarget.');
Directory buildDir = new Directory(path.join('build', 'ios_$logTarget'));
if (!buildDir.existsSync())
await buildDir.create();
bool result = await buildIOSXcodeProject(app, bool result = await buildIOSXcodeProject(app,
buildForDevice: !forSimulator, buildDirectory: buildDir, codesign: shouldCodesign); buildForDevice: !forSimulator, codesign: shouldCodesign);
if (!result) { if (!result) {
printError('Encountered error while building for $logTarget.'); printError('Encountered error while building for $logTarget.');
return 1; return 1;
} }
printStatus('Built in ${buildDir.path}.'); printStatus('Built in ios/.generated.');
return 0; return 0;
} }
......
...@@ -97,7 +97,7 @@ bool _xcodeVersionCheckValid(int major, int minor) { ...@@ -97,7 +97,7 @@ bool _xcodeVersionCheckValid(int major, int minor) {
} }
Future<bool> buildIOSXcodeProject(ApplicationPackage app, Future<bool> buildIOSXcodeProject(ApplicationPackage app,
{ bool buildForDevice, Directory buildDirectory, bool codesign: true }) async { { bool buildForDevice, bool codesign: true }) async {
String flutterProjectPath = Directory.current.path; String flutterProjectPath = Directory.current.path;
if (xcodeProjectRequiresUpdate()) { if (xcodeProjectRequiresUpdate()) {
...@@ -132,15 +132,6 @@ Future<bool> buildIOSXcodeProject(ApplicationPackage app, ...@@ -132,15 +132,6 @@ Future<bool> buildIOSXcodeProject(ApplicationPackage app,
'ONLY_ACTIVE_ARCH=YES', 'ONLY_ACTIVE_ARCH=YES',
]; ];
if (buildDirectory != null) {
if (!buildDirectory.existsSync()) {
printError('The specified build directory ${buildDirectory.path} does not exist');
return false;
}
commands.add('TARGET_BUILD_DIR=${buildDirectory.absolute.path}');
}
if (buildForDevice) { if (buildForDevice) {
commands.addAll(<String>['-sdk', 'iphoneos', '-arch', 'arm64']); commands.addAll(<String>['-sdk', 'iphoneos', '-arch', 'arm64']);
if (!codesign) { if (!codesign) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment