Skip to content

Commit 88526d1

Browse files
committed
Cleanup SwiftBuild prefixes
1 parent d31631e commit 88526d1

File tree

3 files changed

+24
-24
lines changed

3 files changed

+24
-24
lines changed

Sources/SwiftBuildSupport/PackagePIFBuilder.swift

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -47,12 +47,12 @@ public final class PackagePIFBuilder {
4747
let packageManifest: PackageModel.Manifest // FIXME: Can't we just use `package.manifest` instead? —— Paulo
4848

4949
/// The built PIF project object.
50-
public var pifProject: SwiftBuild.ProjectModel.Project {
50+
public var pifProject: ProjectModel.Project {
5151
assert(self._pifProject != nil, "Call build() method to build the PIF first")
5252
return self._pifProject!
5353
}
5454

55-
private var _pifProject: SwiftBuild.ProjectModel.Project?
55+
private var _pifProject: ProjectModel.Project?
5656

5757
/// Scope for logging informational debug messages (intended for developers, not end users).
5858
let observabilityScope: ObservabilityScope
@@ -91,7 +91,7 @@ public final class PackagePIFBuilder {
9191

9292
/// For executables — only executables for now — we check to see if there is a custom package product type
9393
/// provider that can provide this information.
94-
func customProductType(forExecutable product: PackageModel.Product) -> SwiftBuild.ProjectModel.Target.ProductType?
94+
func customProductType(forExecutable product: PackageModel.Product) -> ProjectModel.Target.ProductType?
9595

9696
/// Returns all *device family* IDs for all SDK variants.
9797
func deviceFamilyIDs() -> Set<Int>
@@ -103,12 +103,12 @@ public final class PackagePIFBuilder {
103103
var isPluginExecutionSandboxingDisabled: Bool { get }
104104

105105
/// Hook to customize the project-wide build settings.
106-
func configureProjectBuildSettings(_ buildSettings: inout SwiftBuild.ProjectModel.BuildSettings)
106+
func configureProjectBuildSettings(_ buildSettings: inout ProjectModel.BuildSettings)
107107

108108
/// Hook to customize source module build settings.
109109
func configureSourceModuleBuildSettings(
110110
sourceModule: PackageGraph.ResolvedModule,
111-
settings: inout SwiftBuild.ProjectModel.BuildSettings
111+
settings: inout ProjectModel.BuildSettings
112112
)
113113

114114
/// Custom install path for the specified product, if any.
@@ -124,13 +124,13 @@ public final class PackagePIFBuilder {
124124
func customSDKOptions(forPlatform: PackageModel.Platform) -> [String]
125125

126126
/// Create additional custom PIF targets after all targets have been built.
127-
func addCustomTargets(pifProject: SwiftBuild.ProjectModel.Project) throws -> [PackagePIFBuilder.ModuleOrProduct]
127+
func addCustomTargets(pifProject: ProjectModel.Project) throws -> [PackagePIFBuilder.ModuleOrProduct]
128128

129129
/// Should we suppresses the specific product dependency, updating the provided build settings if necessary?
130130
/// The specified product may be in the same package or a different one.
131131
func shouldSuppressProductDependency(
132132
product: PackageModel.Product,
133-
buildSettings: inout SwiftBuild.ProjectModel.BuildSettings
133+
buildSettings: inout ProjectModel.BuildSettings
134134
) -> Bool
135135

136136
/// Should we set the install path for a dynamic library/framework?
@@ -212,7 +212,7 @@ public final class PackagePIFBuilder {
212212

213213
/// Build an empty PIF project for the specified `Package`.
214214

215-
public class func buildEmptyPIF(package: PackageModel.Package) -> SwiftBuild.ProjectModel.Project {
215+
public class func buildEmptyPIF(package: PackageModel.Package) -> ProjectModel.Project {
216216
self.buildEmptyPIF(
217217
id: "PACKAGE:\(package.identity)",
218218
path: package.manifest.path.pathString,
@@ -229,7 +229,7 @@ public final class PackagePIFBuilder {
229229
projectDir: String,
230230
name: String,
231231
developmentRegion: String? = nil
232-
) -> SwiftBuild.ProjectModel.Project {
232+
) -> ProjectModel.Project {
233233
var project = ProjectModel.Project(
234234
id: GUID(id),
235235
path: path,
@@ -246,7 +246,7 @@ public final class PackagePIFBuilder {
246246
}
247247

248248
public func buildPlaceholderPIF(id: String, path: String, projectDir: String, name: String) -> ModuleOrProduct {
249-
var project = SwiftBuild.ProjectModel.Project(
249+
var project = ProjectModel.Project(
250250
id: GUID(id),
251251
path: path,
252252
projectDir: projectDir,
@@ -261,7 +261,7 @@ public final class PackagePIFBuilder {
261261
let targetKP = try! project.addAggregateTarget { _ in
262262
ProjectModel.AggregateTarget(id: "PACKAGE-PLACEHOLDER:\(id)", name: id)
263263
}
264-
let targetSettings: SwiftBuild.ProjectModel.BuildSettings = self.package.underlying.packageBaseBuildSettings
264+
let targetSettings: ProjectModel.BuildSettings = self.package.underlying.packageBaseBuildSettings
265265

266266
project[keyPath: targetKP].common.addBuildConfig { id in
267267
ProjectModel.BuildConfig(id: id, name: "Debug", settings: targetSettings)
@@ -350,7 +350,7 @@ public final class PackagePIFBuilder {
350350

351351
public var description: String { rawValue }
352352

353-
init(from pifProductType: SwiftBuild.ProjectModel.Target.ProductType) {
353+
init(from pifProductType: ProjectModel.Target.ProductType) {
354354
self = switch pifProductType {
355355
case .application: .application
356356
case .staticArchive: .staticArchive
@@ -525,7 +525,7 @@ public final class PackagePIFBuilder {
525525
self.delegate.configureProjectBuildSettings(&settings)
526526

527527
for (platform, platformOptions) in self.package.sdkOptions(delegate: self.delegate) {
528-
let pifPlatform = SwiftBuild.ProjectModel.BuildSettings.Platform(from: platform)
528+
let pifPlatform = ProjectModel.BuildSettings.Platform(from: platform)
529529
settings.platformSpecificSettings[pifPlatform]![.SPECIALIZATION_SDK_OPTIONS]!
530530
.append(contentsOf: platformOptions)
531531
}

Sources/SwiftBuildSupport/PackagePIFProjectBuilder+Modules.swift

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -235,7 +235,7 @@ extension PackagePIFProjectBuilder {
235235

236236
let pifTargetName: String
237237
let executableName: String
238-
let productType: SwiftBuild.ProjectModel.Target.ProductType
238+
let productType: ProjectModel.Target.ProductType
239239

240240
switch desiredModuleType {
241241
case .dynamicLibrary:
@@ -814,14 +814,14 @@ extension PackagePIFProjectBuilder {
814814
)
815815
}
816816

817-
let settings: SwiftBuild.ProjectModel.BuildSettings = self.package.underlying.packageBaseBuildSettings
817+
let settings: ProjectModel.BuildSettings = self.package.underlying.packageBaseBuildSettings
818818
let pkgConfig = try systemLibrary.pkgConfig(
819819
package: self.package,
820820
observabilityScope: pifBuilder.observabilityScope
821821
)
822822

823823
// Impart the header search path to all direct and indirect clients.
824-
var impartedSettings = SwiftBuild.ProjectModel.BuildSettings()
824+
var impartedSettings = ProjectModel.BuildSettings()
825825
impartedSettings[.OTHER_CFLAGS] = ["-fmodule-map-file=\(systemLibrary.modulemapFileAbsolutePath)"] +
826826
pkgConfig.cFlags.prepending("$(inherited)")
827827
impartedSettings[.OTHER_LDFLAGS] = pkgConfig.libs.prepending("$(inherited)")

Sources/SwiftBuildSupport/PackagePIFProjectBuilder+Products.swift

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ extension PackagePIFProjectBuilder {
4949
}
5050

5151
// Determine the kind of PIF target *product type* to create for the package product.
52-
let pifProductType: SwiftBuild.ProjectModel.Target.ProductType
52+
let pifProductType: ProjectModel.Target.ProductType
5353
let moduleOrProductType: PackagePIFBuilder.ModuleOrProductType
5454
let synthesizedResourceGeneratingPluginInvocationResults: [PackagePIFBuilder.BuildToolPluginInvocationResult] =
5555
[]
@@ -107,7 +107,7 @@ extension PackagePIFProjectBuilder {
107107

108108
// Configure the target-wide build settings. The details depend on the kind of product we're building,
109109
// but are in general the ones that are suitable for end-product artifacts such as executables and test bundles.
110-
var settings: SwiftBuild.ProjectModel.BuildSettings = package.underlying.packageBaseBuildSettings
110+
var settings: ProjectModel.BuildSettings = package.underlying.packageBaseBuildSettings
111111
settings[.TARGET_NAME] = product.name
112112
settings[.PACKAGE_RESOURCE_TARGET_KIND] = "regular"
113113
settings[.PRODUCT_NAME] = "$(TARGET_NAME)"
@@ -444,8 +444,8 @@ extension PackagePIFProjectBuilder {
444444
// Until this point the build settings for the target have been the same between debug and release
445445
// configurations.
446446
// The custom manifest settings might cause them to diverge.
447-
var debugSettings: SwiftBuild.ProjectModel.BuildSettings = settings
448-
var releaseSettings: SwiftBuild.ProjectModel.BuildSettings = settings
447+
var debugSettings: ProjectModel.BuildSettings = settings
448+
var releaseSettings: ProjectModel.BuildSettings = settings
449449

450450
// Apply target-specific build settings defined in the manifest.
451451
for (buildConfig, declarationsByPlatform) in mainModule.allBuildSettings.targetSettings {
@@ -493,7 +493,7 @@ extension PackagePIFProjectBuilder {
493493
with packageConditions: [PackageModel.PackageCondition],
494494
isLinkable: Bool,
495495
targetKeyPath: WritableKeyPath<ProjectModel.Project, ProjectModel.Target>,
496-
settings: inout SwiftBuild.ProjectModel.BuildSettings
496+
settings: inout ProjectModel.BuildSettings
497497
) {
498498
// Do not add a dependency for binary-only executable products since they are not part of the build.
499499
if product.isBinaryOnlyExecutableProduct {
@@ -571,7 +571,7 @@ extension PackagePIFProjectBuilder {
571571

572572
let pifTargetProductName: String
573573
let executableName: String
574-
let productType: SwiftBuild.ProjectModel.Target.ProductType
574+
let productType: ProjectModel.Target.ProductType
575575

576576
if desiredProductType == .dynamic {
577577
if pifBuilder.createDylibForDynamicProducts {
@@ -665,7 +665,7 @@ extension PackagePIFProjectBuilder {
665665
}
666666
}
667667

668-
var settings: SwiftBuild.ProjectModel.BuildSettings = package.underlying.packageBaseBuildSettings
668+
var settings: ProjectModel.BuildSettings = package.underlying.packageBaseBuildSettings
669669

670670
// Add other build settings when we're building an actual dylib.
671671
if desiredProductType == .dynamic {
@@ -923,7 +923,7 @@ extension PackagePIFProjectBuilder {
923923
log(.debug, "Created aggregate target '\(pluginTarget.id)' with name '\(pluginTarget.name)'")
924924
}
925925

926-
let buildSettings: SwiftBuild.ProjectModel.BuildSettings = package.underlying.packageBaseBuildSettings
926+
let buildSettings: ProjectModel.BuildSettings = package.underlying.packageBaseBuildSettings
927927
self.project[keyPath: pluginTargetKeyPath].common.addBuildConfig { id in
928928
BuildConfig(id: id, name: "Debug", settings: buildSettings)
929929
}

0 commit comments

Comments
 (0)