@@ -737,7 +737,7 @@ public final class BuildOperation: PackageStructureDelegate, SPMBuildCore.BuildS
737
737
let buildToolPluginInvocationResults : [ ResolvedModule . ID : ( target: ResolvedModule , results: [ BuildToolPluginInvocationResult ] ) ]
738
738
let prebuildCommandResults : [ ResolvedModule . ID : [ PrebuildCommandResult ] ]
739
739
// Invoke any build tool plugins in the graph to generate prebuild commands and build commands.
740
- if let pluginConfiguration, !self . config. shouldSkipBuilding ( for: . target) {
740
+ if let pluginConfiguration: PluginConfiguration , !self . config. shouldSkipBuilding ( for: . target) {
741
741
let pluginsPerModule = graph. pluginsPerModule (
742
742
satisfying: self . config. buildEnvironment ( for: . host)
743
743
)
@@ -823,6 +823,7 @@ public final class BuildOperation: PackageStructureDelegate, SPMBuildCore.BuildS
823
823
destinationBuildParameters: self . config. destinationBuildParameters,
824
824
toolsBuildParameters: self . config. buildParameters ( for: . host) ,
825
825
graph: graph,
826
+ pluginConfiguration: self . pluginConfiguration,
826
827
additionalFileRules: additionalFileRules,
827
828
buildToolPluginInvocationResults: buildToolPluginInvocationResults. mapValues ( \. results) ,
828
829
prebuildCommandResults: prebuildCommandResults,
@@ -1024,22 +1025,24 @@ public final class BuildOperation: PackageStructureDelegate, SPMBuildCore.BuildS
1024
1025
}
1025
1026
}
1026
1027
1027
- extension BuildOperation {
1028
- public struct PluginConfiguration {
1029
- /// Entity responsible for compiling and running plugin scripts.
1030
- let scriptRunner : PluginScriptRunner
1028
+ public struct PluginConfiguration {
1029
+ /// Entity responsible for compiling and running plugin scripts.
1030
+ let scriptRunner : PluginScriptRunner
1031
1031
1032
- /// Directory where plugin intermediate files are stored.
1033
- let workDirectory : AbsolutePath
1032
+ /// Directory where plugin intermediate files are stored.
1033
+ let workDirectory : AbsolutePath
1034
1034
1035
- /// Whether to sandbox commands from build tool plugins.
1036
- let disableSandbox : Bool
1035
+ /// Whether to sandbox commands from build tool plugins.
1036
+ let disableSandbox : Bool
1037
1037
1038
- public init ( scriptRunner: PluginScriptRunner , workDirectory: AbsolutePath , disableSandbox: Bool ) {
1039
- self . scriptRunner = scriptRunner
1040
- self . workDirectory = workDirectory
1041
- self . disableSandbox = disableSandbox
1042
- }
1038
+ public init (
1039
+ scriptRunner: PluginScriptRunner ,
1040
+ workDirectory: AbsolutePath ,
1041
+ disableSandbox: Bool
1042
+ ) {
1043
+ self . scriptRunner = scriptRunner
1044
+ self . workDirectory = workDirectory
1045
+ self . disableSandbox = disableSandbox
1043
1046
}
1044
1047
}
1045
1048
@@ -1070,10 +1073,10 @@ extension BuildOperation {
1070
1073
destinationBuildParameters: config. destinationBuildParameters,
1071
1074
toolsBuildParameters: config. toolsBuildParameters,
1072
1075
graph: graph,
1076
+ pluginConfiguration: nil ,
1073
1077
additionalFileRules: [ ] ,
1074
1078
buildToolPluginInvocationResults: [ : ] ,
1075
1079
prebuildCommandResults: [ : ] ,
1076
- disableSandbox: false ,
1077
1080
fileSystem: config. fileSystem,
1078
1081
observabilityScope: config. observabilityScope
1079
1082
)
0 commit comments