Improve output when using XCBuild (#2726)

- Print build diagnostics and output as they both are used for potential
error message
- If the build failed, was canceled or aborted, log a message.

rdar://problem/60925204

Author: neonichu

Sources/XCBuildSupport/XCBuildDelegate.swift

@@ -57,6 +57,21 @@ extension XCBuildDelegate: XCBuildOutputParserDelegate {
             queue.async {
                 self.progressAnimation.clear()
                 self.outputStream <<< info.data
+                self.outputStream <<< "\n"
+                self.outputStream.flush()
+            }
+        case .buildDiagnostic(let info):
+            queue.async {
+                self.progressAnimation.clear()
+                self.outputStream <<< info.message
+                self.outputStream <<< "\n"
+                self.outputStream.flush()
+            }
+        case .buildOutput(let info):
+            queue.async {
+                self.progressAnimation.clear()
+                self.outputStream <<< info.data
+                self.outputStream <<< "\n"
                 self.outputStream.flush()
             }
         case .didUpdateProgress(let info):
@@ -66,8 +81,14 @@ extension XCBuildDelegate: XCBuildOutputParserDelegate {
             }
         case .buildCompleted(let info):
             queue.async {
-                if info.result == .ok, self.didEmitProgressOutput {
-                    self.progressAnimation.update(step: 100, total: 100, text: "Build succeeded")
+                switch info.result {
+                case .aborted, .cancelled, .failed:
+                    self.outputStream <<< "Build \(info.result)\n"
+                    self.outputStream.flush()
+                case .ok:
+                    if self.didEmitProgressOutput {
+                        self.progressAnimation.update(step: 100, total: 100, text: "Build succeeded")
+                    }
                 }
             }
         default:

Sources/XCBuildSupport/XCBuildOutputParser.swift

@@ -23,11 +23,16 @@ public enum XCBuildMessage {
             case ok
             case failed
             case cancelled
+            case aborted
         }
 
         public let result: Result
     }
 
+    public struct BuildOutputInfo {
+        let data: String
+    }
+
     public struct DidUpdateProgressInfo {
         public let message: String
         public let percentComplete: Double
@@ -101,6 +106,7 @@ public enum XCBuildMessage {
     case buildStarted
     case buildDiagnostic(BuildDiagnosticInfo)
     case buildCompleted(BuildCompletedInfo)
+    case buildOutput(BuildOutputInfo)
     case preparationComplete
     case didUpdateProgress(DidUpdateProgressInfo)
     case targetUpToDate(TargetUpToDateInfo)
@@ -187,6 +193,7 @@ extension XCBuildOutputParser: JSONMessageStreamingParserDelegate {
 extension XCBuildMessage.BuildDiagnosticInfo: Decodable, Equatable {}
 extension XCBuildMessage.BuildCompletedInfo.Result: Decodable, Equatable {}
 extension XCBuildMessage.BuildCompletedInfo: Decodable, Equatable {}
+extension XCBuildMessage.BuildOutputInfo: Decodable, Equatable {}
 extension XCBuildMessage.TargetUpToDateInfo: Decodable, Equatable {}
 extension XCBuildMessage.TaskDiagnosticInfo: Decodable, Equatable {}
 extension XCBuildMessage.TargetDiagnosticInfo: Decodable, Equatable {}
@@ -322,6 +329,8 @@ extension XCBuildMessage: Decodable, Equatable {
             self = try .buildDiagnostic(BuildDiagnosticInfo(from: decoder))
         case "buildCompleted":
             self = try .buildCompleted(BuildCompletedInfo(from: decoder))
+        case "buildOutput":
+            self = try .buildOutput(BuildOutputInfo(from: decoder))
         case "preparationComplete":
             self = .preparationComplete
         case "didUpdateProgress":
@@ -345,7 +354,7 @@ extension XCBuildMessage: Decodable, Equatable {
         case "targetDiagnostic":
             self = try .targetDiagnostic(TargetDiagnosticInfo(from: decoder))
         default:
-            throw DecodingError.dataCorruptedError(forKey: .kind, in: container, debugDescription: "invalid kind")
+            throw DecodingError.dataCorruptedError(forKey: .kind, in: container, debugDescription: "invalid kind \(kind)")
         }
     }
 }