Skip to content

Commit b54c32a

Browse files
committed
Update port to macPort for Code Review suggestion
1 parent a2ca705 commit b54c32a

File tree

11 files changed

+24
-23
lines changed

11 files changed

+24
-23
lines changed

Documentation/Usage.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@ print(options)
160160
```
161161

162162
To `import Clibgit`, the package manager requires that the libgit2 library has
163-
been installed by a system packager (eg. `apt`, `brew`, `port`, `yum`, `nuget`, etc.). The
163+
been installed by a system packager (eg. `apt`, `brew`, `macPort`, `yum`, `nuget`, etc.). The
164164
following files from the libgit2 system-package are of interest:
165165

166166
/usr/local/lib/libgit2.dylib # .so on Linux

Sources/PackageDescription/PackageDescription.docc/Curation/SystemPackageProvider.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,6 @@
55
### Providing Hints to Users of System Packages
66

77
- ``brew(_:)``
8-
- ``port(_:)``
8+
- ``macPort(_:)``
99
- ``apt(_:)``
1010
- ``yum(_:)``

Sources/PackageDescription/PackageDescription.swift

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -379,7 +379,7 @@ public enum SystemPackageProvider {
379379
case brewItem([String])
380380
/// Packages installable by the MacPorts package manager.
381381
@available(_PackageDescription, introduced: 999.0)
382-
case portItem([String])
382+
case macPortItem([String])
383383
/// Packages installable by the apt-get package manager.
384384
case aptItem([String])
385385
/// Packages installable by the Yellowdog Updated, Modified (YUM) package manager.
@@ -405,8 +405,9 @@ public enum SystemPackageProvider {
405405
/// - Parameter packages: The list of package names.
406406
///
407407
/// - Returns: A package provider.
408-
public static func port(_ packages: [String]) -> SystemPackageProvider {
409-
return .portItem(packages)
408+
@available(_PackageDescription, introduced: 999.0)
409+
public static func macPort(_ packages: [String]) -> SystemPackageProvider {
410+
return .macPortItem(packages)
410411
}
411412

412413
/// Creates a system package provider with a list of installable packages

Sources/PackageDescription/PackageDescriptionSerialization.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -261,7 +261,7 @@ enum Serialization {
261261

262262
enum SystemPackageProvider: Codable {
263263
case brew([String])
264-
case port([String])
264+
case macPort([String])
265265
case apt([String])
266266
case yum([String])
267267
case nuget([String])

Sources/PackageDescription/PackageDescriptionSerializationConversion.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -387,7 +387,7 @@ extension Serialization.SystemPackageProvider {
387387
init(_ provider: PackageDescription.SystemPackageProvider) {
388388
switch provider {
389389
case .brewItem(let values): self = .brew(values)
390-
case .portItem(let values): self = .port(values)
390+
case .macPortItem(let values): self = .macPort(values)
391391
case .aptItem(let values): self = .apt(values)
392392
case .yumItem(let values): self = .yum(values)
393393
case .nugetItem(let values): self = .nuget(values)

Sources/PackageLoading/ManifestJSONParser.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -259,8 +259,8 @@ extension SystemPackageProviderDescription {
259259
switch provider {
260260
case .brew(let values):
261261
self = .brew(values)
262-
case .port(let values):
263-
self = .port(values)
262+
case .macPort(let values):
263+
self = .macPort(values)
264264
case .apt(let values):
265265
self = .apt(values)
266266
case .yum(let values):

Sources/PackageLoading/Target+PkgConfig.swift

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@ extension SystemPackageProviderDescription {
148148
switch self {
149149
case .brew(let packages):
150150
return " brew install \(packages.joined(separator: " "))\n"
151-
case .port(let packages):
151+
case .macPort(let packages):
152152
return " port install \(packages.joined(separator: " "))\n"
153153
case .apt(let packages):
154154
return " apt-get install \(packages.joined(separator: " "))\n"
@@ -167,7 +167,7 @@ extension SystemPackageProviderDescription {
167167
if case .darwin = platform {
168168
return true
169169
}
170-
case .port:
170+
case .macPort:
171171
if case .darwin = platform {
172172
return true
173173
}
@@ -215,7 +215,7 @@ extension SystemPackageProviderDescription {
215215
}
216216
}
217217
return try packages.map({ try AbsolutePath(validating: brewPrefix).appending(components: "opt", $0, "lib", "pkgconfig") })
218-
case .port:
218+
case .macPort:
219219
return [try AbsolutePath(validating: "/opt/local/lib/pkgconfig")]
220220
case .apt:
221221
return []

Sources/PackageModel/Manifest/SystemPackageProviderDescription.swift

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,15 @@
1313
/// Represents system package providers.
1414
public enum SystemPackageProviderDescription: Equatable, Codable, Sendable {
1515
case brew([String])
16-
case port([String])
16+
case macPort([String])
1717
case apt([String])
1818
case yum([String])
1919
case nuget([String])
2020
}
2121

2222
extension SystemPackageProviderDescription {
2323
private enum CodingKeys: String, CodingKey {
24-
case brew, port, apt, yum, nuget
24+
case brew, macPort, apt, yum, nuget
2525
}
2626

2727
public func encode(to encoder: Encoder) throws {
@@ -30,8 +30,8 @@ extension SystemPackageProviderDescription {
3030
case let .brew(a1):
3131
var unkeyedContainer = container.nestedUnkeyedContainer(forKey: .brew)
3232
try unkeyedContainer.encode(a1)
33-
case let .port(a1):
34-
var unkeyedContainer = container.nestedUnkeyedContainer(forKey: .port)
33+
case let .macPort(a1):
34+
var unkeyedContainer = container.nestedUnkeyedContainer(forKey: .macPort)
3535
try unkeyedContainer.encode(a1)
3636
case let .apt(a1):
3737
var unkeyedContainer = container.nestedUnkeyedContainer(forKey: .apt)
@@ -55,10 +55,10 @@ extension SystemPackageProviderDescription {
5555
var unkeyedValues = try values.nestedUnkeyedContainer(forKey: key)
5656
let a1 = try unkeyedValues.decode([String].self)
5757
self = .brew(a1)
58-
case .port:
58+
case .macPort:
5959
var unkeyedValues = try values.nestedUnkeyedContainer(forKey: key)
6060
let a1 = try unkeyedValues.decode([String].self)
61-
self = .port(a1)
61+
self = .macPort(a1)
6262
case .apt:
6363
var unkeyedValues = try values.nestedUnkeyedContainer(forKey: key)
6464
let a1 = try unkeyedValues.decode([String].self)

Sources/PackageModel/ManifestSourceGeneration.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -404,9 +404,9 @@ fileprivate extension SourceCodeFragment {
404404
case .brew(let names):
405405
let params = [SourceCodeFragment(strings: names)]
406406
self.init(enum: "brew", subnodes: params)
407-
case .port(let names):
407+
case .macPort(let names):
408408
let params = [SourceCodeFragment(strings: names)]
409-
self.init(enum: "port", subnodes: params)
409+
self.init(enum: "macPort", subnodes: params)
410410
case .apt(let names):
411411
let params = [SourceCodeFragment(strings: names)]
412412
self.init(enum: "apt", subnodes: params)

Tests/BuildTests/BuildPlanTests.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2891,7 +2891,7 @@ final class BuildPlanTests: XCTestCase {
28912891
pkgConfig: "BTarget",
28922892
providers: [
28932893
.brew(["BTarget"]),
2894-
.port(["BTarget"]),
2894+
.macPort(["BTarget"]),
28952895
.apt(["BTarget"]),
28962896
.yum(["BTarget"]),
28972897
]

0 commit comments

Comments
 (0)