Skip to content

Commit a6f4970

Browse files
pmattospmattos
committed
Minor code review
1 parent efeb5e2 commit a6f4970

File tree

3 files changed

+32
-32
lines changed

3 files changed

+32
-32
lines changed

‎Sources/SwiftBuildSupport/PackagePIFBuilder.swift

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -258,15 +258,15 @@ public final class PackagePIFBuilder {
258258
project.addBuildConfig { id in ProjectModel.BuildConfig(id: id, name: "Debug", settings: projectSettings) }
259259
project.addBuildConfig { id in ProjectModel.BuildConfig(id: id, name: "Release", settings: projectSettings) }
260260

261-
let targetKP = try! project.addAggregateTarget { _ in
261+
let targetKeyPath = try! project.addAggregateTarget { _ in
262262
ProjectModel.AggregateTarget(id: "PACKAGE-PLACEHOLDER:\(id)", name: id)
263263
}
264264
let targetSettings: ProjectModel.BuildSettings = self.package.underlying.packageBaseBuildSettings
265265

266-
project[keyPath: targetKP].common.addBuildConfig { id in
266+
project[keyPath: targetKeyPath].common.addBuildConfig { id in
267267
ProjectModel.BuildConfig(id: id, name: "Debug", settings: targetSettings)
268268
}
269-
project[keyPath: targetKP].common.addBuildConfig { id in
269+
project[keyPath: targetKeyPath].common.addBuildConfig { id in
270270
ProjectModel.BuildConfig(id: id, name: "Release", settings: targetSettings)
271271
}
272272

@@ -276,7 +276,7 @@ public final class PackagePIFBuilder {
276276
type: .placeholder,
277277
name: name,
278278
moduleName: name,
279-
pifTarget: .aggregate(project[keyPath: targetKP]),
279+
pifTarget: .aggregate(project[keyPath: targetKeyPath]),
280280
indexableFileURLs: [],
281281
headerFiles: [],
282282
linkedPackageBinaries: [],

‎Sources/SwiftBuildSupport/PackagePIFProjectBuilder+Modules.swift

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ extension PackagePIFProjectBuilder {
3636
precondition(pluginModule.type == .plugin)
3737

3838
// Create an executable PIF target in order to get specialization.
39-
let pluginPifTargetKP = try self.project.addTarget { _ in
39+
let pluginTargetKeyPath = try self.project.addTarget { _ in
4040
ProjectModel.Target(
4141
id: pluginModule.pifTargetGUID(),
4242
productType: .executable,
@@ -45,8 +45,8 @@ extension PackagePIFProjectBuilder {
4545
)
4646
}
4747
do {
48-
let pluginPifTarget = self.project[keyPath: pluginPifTargetKP]
49-
log(.debug, "Created \(pluginPifTarget.productType) '\(pluginPifTarget.id)' with name '\(pluginPifTarget.name)'")
48+
let pluginTarget = self.project[keyPath: pluginTargetKeyPath]
49+
log(.debug, "Created \(pluginTarget.productType) '\(pluginTarget.id)' with name '\(pluginTarget.name)'")
5050
}
5151

5252
var buildSettings: ProjectModel.BuildSettings = self.package.underlying.packageBaseBuildSettings
@@ -71,7 +71,7 @@ extension PackagePIFProjectBuilder {
7171
.productRepresentingDependencyOfBuildPlugin(in: moduleProducts)
7272

7373
if let productDependency {
74-
self.project[keyPath: pluginPifTargetKP].common.addDependency(
74+
self.project[keyPath: pluginTargetKeyPath].common.addDependency(
7575
on: productDependency.pifTargetGUID(),
7676
platformFilters: dependencyPlatformFilters
7777
)
@@ -86,7 +86,7 @@ extension PackagePIFProjectBuilder {
8686

8787
case .library, .systemModule, .test, .binary, .plugin, .macro:
8888
let dependencyGUID = moduleDependency.pifTargetGUID()
89-
self.project[keyPath: pluginPifTargetKP].common.addDependency(
89+
self.project[keyPath: pluginTargetKeyPath].common.addDependency(
9090
on: dependencyGUID,
9191
platformFilters: dependencyPlatformFilters
9292
)
@@ -107,7 +107,7 @@ extension PackagePIFProjectBuilder {
107107
let dependencyPlatformFilters = packageConditions
108108
.toPlatformFilter(toolsVersion: self.package.manifest.toolsVersion)
109109

110-
self.project[keyPath: pluginPifTargetKP].common.addDependency(
110+
self.project[keyPath: pluginTargetKeyPath].common.addDependency(
111111
on: dependencyGUID,
112112
platformFilters: dependencyPlatformFilters
113113
)
@@ -119,18 +119,18 @@ extension PackagePIFProjectBuilder {
119119
// Any dependencies of plugin targets need to be built for the host.
120120
buildSettings[.SUPPORTED_PLATFORMS] = ["$(HOST_PLATFORM)"]
121121

122-
self.project[keyPath: pluginPifTargetKP].common.addBuildConfig { id in
122+
self.project[keyPath: pluginTargetKeyPath].common.addBuildConfig { id in
123123
BuildConfig(id: id, name: "Debug", settings: buildSettings)
124124
}
125-
self.project[keyPath: pluginPifTargetKP].common.addBuildConfig { id in
125+
self.project[keyPath: pluginTargetKeyPath].common.addBuildConfig { id in
126126
BuildConfig(id: id, name: "Release", settings: buildSettings)
127127
}
128128

129129
let pluginModuleMetadata = PackagePIFBuilder.ModuleOrProduct(
130130
type: .plugin,
131131
name: pluginModule.name,
132132
moduleName: pluginModule.name,
133-
pifTarget: .target(self.project[keyPath: pluginPifTargetKP]),
133+
pifTarget: .target(self.project[keyPath: pluginTargetKeyPath]),
134134
indexableFileURLs: [],
135135
headerFiles: [],
136136
linkedPackageBinaries: [],
@@ -281,10 +281,10 @@ extension PackagePIFProjectBuilder {
281281
)
282282
}
283283
do {
284-
let sourceModulePifTarget = self.project[keyPath: sourceModuleTargetKeyPath]
284+
let sourceModuleTarget = self.project[keyPath: sourceModuleTargetKeyPath]
285285
log(.debug,
286-
"Created \(sourceModulePifTarget.productType) '\(sourceModulePifTarget.id)' " +
287-
"with name '\(sourceModulePifTarget.name)' and product name '\(sourceModulePifTarget.productName)'"
286+
"Created \(sourceModuleTarget.productType) '\(sourceModuleTarget.id)' " +
287+
"with name '\(sourceModuleTarget.name)' and product name '\(sourceModuleTarget.productName)'"
288288
)
289289
}
290290

@@ -322,14 +322,14 @@ extension PackagePIFProjectBuilder {
322322
}
323323

324324
// Find the PIF target for the resource bundle, if any. Otherwise fall back to the module.
325-
let resourceBundlePifTargetKP = self.resourceBundleTargetKeyPath(forModuleName: sourceModule.name) ?? sourceModuleTargetKeyPath
325+
let resourceBundleTargetKeyPath = self.resourceBundleTargetKeyPath(forModuleName: sourceModule.name) ?? sourceModuleTargetKeyPath
326326

327327
// Add build tool commands to the resource bundle target.
328328
if desiredModuleType != .executable && desiredModuleType != .macro && addBuildToolPluginCommands {
329329
addBuildToolCommands(
330330
module: sourceModule,
331331
sourceModuleTargetKeyPath: sourceModuleTargetKeyPath,
332-
resourceBundleTargetKeyPath: resourceBundlePifTargetKP,
332+
resourceBundleTargetKeyPath: resourceBundleTargetKeyPath,
333333
sourceFilePaths: generatedSourceFiles,
334334
resourceFilePaths: generatedResourceFiles
335335
)

‎Sources/SwiftBuildSupport/PackagePIFProjectBuilder.swift

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -167,15 +167,15 @@ struct PackagePIFProjectBuilder {
167167

168168
let bundleName = self.resourceBundleName(forModuleName: module.name)
169169
let resourceBundleGUID = self.pifTargetIdForResourceBundle(module.name)
170-
let resourcesTargetKP = try self.project.addTarget { id in
170+
let resourcesTargetKeyPath = try self.project.addTarget { id in
171171
ProjectModel.Target(
172172
id: resourceBundleGUID,
173173
productType: .bundle,
174174
name: bundleName,
175175
productName: bundleName
176176
)
177177
}
178-
var resourcesTarget: ProjectModel.Target { self.project[keyPath: resourcesTargetKP] }
178+
var resourcesTarget: ProjectModel.Target { self.project[keyPath: resourcesTargetKeyPath] }
179179

180180
self.project[keyPath: targetKeyPath].common.addDependency(
181181
on: resourcesTarget.id,
@@ -185,7 +185,7 @@ struct PackagePIFProjectBuilder {
185185
self.log(.debug, indent: 1, "Added dependency on resource target '\(resourcesTarget.id)'")
186186

187187
for pluginModule in module.pluginsAppliedToModule {
188-
self.project[keyPath: resourcesTargetKP].common.addDependency(
188+
self.project[keyPath: resourcesTargetKeyPath].common.addDependency(
189189
on: pluginModule.pifTargetGUID(),
190190
platformFilters: [],
191191
linkProduct: false
@@ -212,17 +212,17 @@ struct PackagePIFProjectBuilder {
212212
settings[.COREML_COMPILER_CONTAINER] = "swift-package"
213213
settings[.COREML_CODEGEN_LANGUAGE] = "None"
214214

215-
self.project[keyPath: resourcesTargetKP].common.addBuildConfig { id in
215+
self.project[keyPath: resourcesTargetKeyPath].common.addBuildConfig { id in
216216
BuildConfig(id: id, name: "Debug", settings: settings)
217217
}
218-
self.project[keyPath: resourcesTargetKP].common.addBuildConfig { id in
218+
self.project[keyPath: resourcesTargetKeyPath].common.addBuildConfig { id in
219219
BuildConfig(id: id, name: "Release", settings: settings)
220220
}
221221

222222
let result = self.processResources(
223223
for: module,
224224
sourceModuleTargetKeyPath: targetKeyPath,
225-
resourceBundleTargetKeyPath: resourcesTargetKP,
225+
resourceBundleTargetKeyPath: resourcesTargetKeyPath,
226226
generatedResourceFiles: generatedResourceFiles
227227
)
228228

@@ -255,8 +255,8 @@ struct PackagePIFProjectBuilder {
255255
shouldGenerateEmbedInCodeAccessor: false
256256
)
257257
}
258-
// If `resourceBundlePifTarget` is nil, we add resources to the `sourceModulePifTarget`.
259-
let pifTargetForResourcesKP = resourceBundleTargetKeyPath ?? sourceModuleTargetKeyPath
258+
// If resourceBundleTarget is nil, we add resources to the sourceModuleTarget instead.
259+
let targetForResourcesKeyPath = resourceBundleTargetKeyPath ?? sourceModuleTargetKeyPath
260260

261261
// Generated resources get a default treatment for rule and localization.
262262
let generatedResources = generatedResourceFiles.compactMap {
@@ -303,12 +303,12 @@ struct PackagePIFProjectBuilder {
303303
let isMetalFile = SwiftBuild.SwiftBuildFileType.metal.fileTypes.contains(resourcePath.pathExtension)
304304

305305
if isMetalFile {
306-
self.project[keyPath: pifTargetForResourcesKP].addSourceFile { id in
306+
self.project[keyPath: targetForResourcesKeyPath].addSourceFile { id in
307307
BuildFile(id: id, fileRef: ref)
308308
}
309309
} else {
310310
// FIXME: Handle additional rules here (e.g. `.copy`).
311-
self.project[keyPath: pifTargetForResourcesKP].addResourceFile { id in
311+
self.project[keyPath: targetForResourcesKeyPath].addResourceFile { id in
312312
BuildFile(
313313
id: id,
314314
fileRef: ref,
@@ -330,22 +330,22 @@ struct PackagePIFProjectBuilder {
330330
self.log(.debug, indent: 2, "Added resource file '\(resourcePath)'")
331331
}
332332

333-
let resourceBundlePifTargetName: String? = if let resourceBundleTargetKeyPath {
333+
let resourceBundleTargetName: String? = if let resourceBundleTargetKeyPath {
334334
self.project[keyPath: resourceBundleTargetKeyPath].name
335335
} else {
336336
nil
337337
}
338338
return PackagePIFBuilder.EmbedResourcesResult(
339-
bundleName: resourceBundlePifTargetName,
339+
bundleName: resourceBundleTargetName,
340340
shouldGenerateBundleAccessor: shouldGenerateBundleAccessor,
341341
shouldGenerateEmbedInCodeAccessor: shouldGenerateEmbedInCodeAccessor
342342
)
343343
}
344344

345345
func resourceBundleTargetKeyPath(forModuleName name: String) -> WritableKeyPath<ProjectModel.Project, ProjectModel.Target>? {
346346
let resourceBundleGUID = self.pifTargetIdForResourceBundle(name)
347-
let targetKP = self.project.findTarget(id: resourceBundleGUID)
348-
return targetKP
347+
let targetKeyPath = self.project.findTarget(id: resourceBundleGUID)
348+
return targetKeyPath
349349
}
350350

351351
func pifTargetIdForResourceBundle(_ name: String) -> GUID {

0 commit comments

Comments
 (0)