Merge pull request #3033 from davidungar/incremental-build-11-7

David Ungar · web-flow · commit fa43d0df65e1 · 2020-11-12T14:44:24.000-08:00
[Incremental] Update DriverExecutor protocol to be consistent with swift-driver
diff --git a/Sources/Build/SPMSwiftDriverExecutor.swift b/Sources/Build/SPMSwiftDriverExecutor.swift
@@ -57,7 +57,8 @@ final class SPMSwiftDriverExecutor: DriverExecutor {
     return try process.waitUntilExit()
   }
 
-  func execute(jobs: [Job], delegate: JobExecutionDelegate,
+  func execute(workload: DriverExecutorWorkload,
+               delegate: JobExecutionDelegate,
                numParallelJobs: Int, forceResponseFiles: Bool,
                recordedInputModificationDates: [TypedVirtualPath : Date]) throws {
     fatalError("Multi-job build plans should be lifted into the SPM build graph.")

Original file line number	Diff line number	Diff line change
`@@ -57,7 +57,8 @@ final class SPMSwiftDriverExecutor: DriverExecutor {`
`57`	`57`	`return try process.waitUntilExit()`
`58`	`58`	`}`
`59`	`59`
`60`		`- func execute(jobs: [Job], delegate: JobExecutionDelegate,`
	`60`	`+ func execute(workload: DriverExecutorWorkload,`
	`61`	`+ delegate: JobExecutionDelegate,`
`61`	`62`	`numParallelJobs: Int, forceResponseFiles: Bool,`
`62`	`63`	`recordedInputModificationDates: [TypedVirtualPath : Date]) throws {`
`63`	`64`	`fatalError("Multi-job build plans should be lifted into the SPM build graph.")`