Unverified Commit 2d47481f authored by Mikkel Nygaard Ravn's avatar Mikkel Nygaard Ravn Committed by GitHub

Revert "Reduce xcodebuild noise #2" (#14641)

Merging to get back to a green tree.
parent ce82cc65
...@@ -4,9 +4,7 @@ ...@@ -4,9 +4,7 @@
# found in the LICENSE file. # found in the LICENSE file.
RunCommand() { RunCommand() {
if [[ -n "$VERBOSE_SCRIPT_LOGGING" ]]; then
echo "♦ $*" echo "♦ $*"
fi
"$@" "$@"
return $? return $?
} }
......
...@@ -277,41 +277,16 @@ Future<XcodeBuildResult> buildXcodeProject({ ...@@ -277,41 +277,16 @@ Future<XcodeBuildResult> buildXcodeProject({
); );
} }
final Status cleanStatus =
logger.startProgress('Running Xcode clean...', expectSlowOperation: true);
final RunResult cleanResult = await runAsync(
<String>[
'/usr/bin/env',
'xcrun',
'xcodebuild',
'clean',
'-configuration', configuration,
],
workingDirectory: app.appDirectory,
);
cleanStatus.stop();
if (cleanResult.exitCode != 0) {
throwToolExit('Xcode failed to clean\n${cleanResult.stderr}');
}
final List<String> commands = <String>[ final List<String> commands = <String>[
'/usr/bin/env', '/usr/bin/env',
'xcrun', 'xcrun',
'xcodebuild', 'xcodebuild',
'clean',
'build', 'build',
'-configuration', configuration, '-configuration', configuration,
'ONLY_ACTIVE_ARCH=YES', 'ONLY_ACTIVE_ARCH=YES',
]; ];
if (logger.isVerbose) {
// An environment variable to be passed to xcode_backend.sh determining
// whether to echo back executed commands.
commands.add('VERBOSE_SCRIPT_LOGGING=YES');
} else {
// This will print warnings and errors only.
commands.add('-quiet');
}
if (developmentTeam != null) if (developmentTeam != null)
commands.add('DEVELOPMENT_TEAM=$developmentTeam'); commands.add('DEVELOPMENT_TEAM=$developmentTeam');
...@@ -343,28 +318,27 @@ Future<XcodeBuildResult> buildXcodeProject({ ...@@ -343,28 +318,27 @@ Future<XcodeBuildResult> buildXcodeProject({
); );
} }
final Status buildStatus = final Status status = logger.startProgress('Running Xcode build...', expectSlowOperation: true);
logger.startProgress('Running Xcode build...', expectSlowOperation: true); final RunResult result = await runAsync(
final RunResult buildResult = await runAsync(
commands, commands,
workingDirectory: app.appDirectory, workingDirectory: app.appDirectory,
allowReentrantFlutter: true allowReentrantFlutter: true
); );
buildStatus.stop(); status.stop();
if (buildResult.exitCode != 0) { if (result.exitCode != 0) {
printStatus('Failed to build iOS app'); printStatus('Failed to build iOS app');
if (buildResult.stderr.isNotEmpty) { if (result.stderr.isNotEmpty) {
printStatus('Error output from Xcode build:\n↳'); printStatus('Error output from Xcode build:\n↳');
printStatus(buildResult.stderr, indent: 4); printStatus(result.stderr, indent: 4);
} }
if (buildResult.stdout.isNotEmpty) { if (result.stdout.isNotEmpty) {
printStatus('Xcode\'s output:\n↳'); printStatus('Xcode\'s output:\n↳');
printStatus(buildResult.stdout, indent: 4); printStatus(result.stdout, indent: 4);
} }
return new XcodeBuildResult( return new XcodeBuildResult(
success: false, success: false,
stdout: buildResult.stdout, stdout: result.stdout,
stderr: buildResult.stderr, stderr: result.stderr,
xcodeBuildExecution: new XcodeBuildExecution( xcodeBuildExecution: new XcodeBuildExecution(
commands, commands,
app.appDirectory, app.appDirectory,
...@@ -374,7 +348,7 @@ Future<XcodeBuildResult> buildXcodeProject({ ...@@ -374,7 +348,7 @@ Future<XcodeBuildResult> buildXcodeProject({
} else { } else {
// Look for 'clean build/<configuration>-<sdk>/Runner.app'. // Look for 'clean build/<configuration>-<sdk>/Runner.app'.
final RegExp regexp = new RegExp(r' clean (.*\.app)$', multiLine: true); final RegExp regexp = new RegExp(r' clean (.*\.app)$', multiLine: true);
final Match match = regexp.firstMatch(buildResult.stdout); final Match match = regexp.firstMatch(result.stdout);
String outputDir; String outputDir;
if (match != null) { if (match != null) {
final String actualOutputDir = match.group(1).replaceAll('\\ ', ' '); final String actualOutputDir = match.group(1).replaceAll('\\ ', ' ');
......
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