support -v

Author: nkcsgexi

Sources/SwiftDriver/Jobs/PrebuiltModulesJob.swift

@@ -12,6 +12,69 @@
 import TSCBasic
 import SwiftOptions
 
+public class PrebuitModuleGenerationDelegate: JobExecutionDelegate {
+  var failingModules = Set<String>()
+  var commandMap: [Int: String] = [:]
+  let diagnosticsEngine: DiagnosticsEngine
+  let verbose: Bool
+  public init(_ diagnosticsEngine: DiagnosticsEngine, _ verbose: Bool) {
+    self.diagnosticsEngine = diagnosticsEngine
+    self.verbose = verbose
+  }
+
+  func printJobInfo(_ job: Job, _ start: Bool) {
+    guard verbose else {
+      return
+    }
+    for arg in job.commandLine {
+      if case .path(let p) = arg {
+        if p.extension == "swiftinterface" {
+          Driver.stdErrQueue.sync {
+            stderrStream <<< (start ? "started: " : "finished: ")
+            stderrStream <<< p.absolutePath!.pathString <<< "\n"
+            stderrStream.flush()
+          }
+          return
+        }
+      }
+    }
+  }
+
+  public func jobStarted(job: Job, arguments: [String], pid: Int) {
+    commandMap[pid] = arguments.reduce("") { return $0 + " " + $1 }
+    printJobInfo(job, true)
+  }
+
+  public var hasStdlibFailure: Bool {
+    return failingModules.contains("Swift") || failingModules.contains("_Concurrency")
+  }
+
+  public func jobFinished(job: Job, result: ProcessResult, pid: Int) {
+    switch result.exitStatus {
+    case .terminated(code: let code):
+      if code == 0 {
+        printJobInfo(job, false)
+      } else {
+        failingModules.insert(job.moduleName)
+        let result: String = try! result.utf8stderrOutput()
+        Driver.stdErrQueue.sync {
+          stderrStream <<< "failed: " <<< commandMap[pid]! <<< "\n"
+          stderrStream <<< result <<< "\n"
+          stderrStream.flush()
+        }
+      }
+#if !os(Windows)
+    case .signalled:
+      diagnosticsEngine.emit(.remark("\(job.moduleName) interrupted"))
+#endif
+    }
+  }
+
+  public func jobSkipped(job: Job) {
+    diagnosticsEngine.emit(.error("\(job.moduleName) skipped"))
+  }
+}
+
 public struct PrebuiltModuleInput {
   // The path to the input/output of the a module building task.
   let path: TypedVirtualPath

Sources/swift-build-sdk-interfaces/main.swift

@@ -38,38 +38,9 @@ if rawOutputDir.isEmpty {
 /// they are Foundation and anything below.
 let coreMode = CommandLine.arguments.contains("-core")
 
-class PrebuitGenDelegate: JobExecutionDelegate {
-  var failingModules = Set<String>()
-  var commandMap: [Int: String] = [:]
-  func jobStarted(job: Job, arguments: [String], pid: Int) {
-    commandMap[pid] = arguments.reduce("") { return $0 + " " + $1 }
-  }
-
-  var hasStdlibFailure: Bool {
-    return failingModules.contains("Swift") || failingModules.contains("_Concurrency")
-  }
+/// Verbose to print more info
+let verbose = CommandLine.arguments.contains("-v")
 
-  func jobFinished(job: Job, result: ProcessResult, pid: Int) {
-    switch result.exitStatus {
-    case .terminated(code: let code):
-      if code != 0 {
-        failingModules.insert(job.moduleName)
-        Driver.stdErrQueue.sync {
-          stderrStream <<< "failed: " <<< commandMap[pid]! <<< "\n"
-          stderrStream.flush()
-        }
-      }
-#if !os(Windows)
-    case .signalled:
-      diagnosticsEngine.emit(.remark("\(job.moduleName) interrupted"))
-#endif
-    }
-  }
-
-  func jobSkipped(job: Job) {
-    diagnosticsEngine.emit(.error("\(job.moduleName) skipped"))
-  }
-}
 do {
   let sdkPath = try VirtualPath(path: sdkPathRaw).absolutePath!
   if !localFileSystem.exists(sdkPath) {
@@ -136,7 +107,7 @@ do {
                             executor: executor,
                             compilerExecutableDir: swiftcPath.parentDirectory)
     let (jobs, danglingJobs) = try driver.generatePrebuitModuleGenerationJobs(with: inputMap, into: outputDir, exhaustive: !coreMode)
-    let delegate = PrebuitGenDelegate()
+    let delegate = PrebuitModuleGenerationDelegate(diagnosticsEngine, verbose)
     do {
       try executor.execute(workload: DriverExecutorWorkload.init(jobs, nil, continueBuildingAfterErrors: true),
                            delegate: delegate, numParallelJobs: 128)