From 03feba786d597b83ba25ae50ecfddfc5d10bb15b Mon Sep 17 00:00:00 2001 From: Saleem Abdulrasool Date: Mon, 24 Aug 2020 18:46:51 -0700 Subject: [PATCH] build: repair build after apple/swift-tools-support-core#117 Remove Triple.swift as tools-support-core now has this defined. ``` /Users/buildnode/jenkins/workspace/swift-package-manager-with-xcode-self-hosted-PR-osx/branch-master/swiftpm/Sources/Build/BuildPlan.swift:1896:23: error: 'Triple' is ambiguous for type lookup in this context fileprivate extension Triple.OS { ^~~~~~ /Users/buildnode/jenkins/workspace/swift-package-manager-with-xcode-self-hosted-PR-osx/branch-master/swiftpm/.build/checkouts/swift-tools-support-core/Sources/TSCUtility/Triple.swift:21:15: note: found this candidate public struct Triple: Encodable, Equatable { ^ /Users/buildnode/jenkins/workspace/swift-package-manager-with-xcode-self-hosted-PR-osx/branch-master/swiftpm/Sources/SPMBuildCore/Triple.swift:21:15: note: found this candidate public struct Triple: Encodable, Equatable { ^ ``` --- Sources/Build/XCFrameworkInfo.swift | 1 + Sources/SPMBuildCore/BuildParameters.swift | 8 ++++---- Sources/SPMBuildCore/CMakeLists.txt | 3 +-- Tests/BuildTests/BuildPlanTests.swift | 14 +++++++------- .../Sources/TSCUtility/CMakeLists.txt | 1 + .../Sources/TSCUtility}/Triple.swift | 0 6 files changed, 14 insertions(+), 13 deletions(-) rename {Sources/SPMBuildCore => swift-tools-support-core/Sources/TSCUtility}/Triple.swift (100%) diff --git a/Sources/Build/XCFrameworkInfo.swift b/Sources/Build/XCFrameworkInfo.swift index ea9607dc73e..258642e2fe8 100644 --- a/Sources/Build/XCFrameworkInfo.swift +++ b/Sources/Build/XCFrameworkInfo.swift @@ -9,6 +9,7 @@ See http://swift.org/CONTRIBUTORS.txt for Swift project authors */ import TSCBasic +import TSCUtility import PackageModel import SPMBuildCore import Foundation diff --git a/Sources/SPMBuildCore/BuildParameters.swift b/Sources/SPMBuildCore/BuildParameters.swift index bef32211bad..b9ff9ddcf9d 100644 --- a/Sources/SPMBuildCore/BuildParameters.swift +++ b/Sources/SPMBuildCore/BuildParameters.swift @@ -47,10 +47,10 @@ public struct BuildParameters: Encodable { private let _toolchain: _Toolchain /// Host triple. - public var hostTriple: Triple + public var hostTriple: TSCUtility.Triple /// Destination triple. - public var triple: Triple + public var triple: TSCUtility.Triple /// The architectures to build for. public var archs: [String] @@ -134,8 +134,8 @@ public struct BuildParameters: Encodable { dataPath: AbsolutePath, configuration: BuildConfiguration, toolchain: Toolchain, - hostTriple: Triple? = nil, - destinationTriple: Triple? = nil, + hostTriple: TSCUtility.Triple? = nil, + destinationTriple: TSCUtility.Triple? = nil, archs: [String] = [], flags: BuildFlags, xcbuildFlags: [String] = [], diff --git a/Sources/SPMBuildCore/CMakeLists.txt b/Sources/SPMBuildCore/CMakeLists.txt index 96d22dca625..c1d686340f0 100644 --- a/Sources/SPMBuildCore/CMakeLists.txt +++ b/Sources/SPMBuildCore/CMakeLists.txt @@ -11,8 +11,7 @@ add_library(SPMBuildCore BuildSystem.swift BuiltTestProduct.swift Sanitizers.swift - Toolchain.swift - Triple.swift) + Toolchain.swift) # NOTE(compnerd) workaround for CMake not setting up include flags yet set_target_properties(SPMBuildCore PROPERTIES INTERFACE_INCLUDE_DIRECTORIES ${CMAKE_Swift_MODULE_DIRECTORY}) diff --git a/Tests/BuildTests/BuildPlanTests.swift b/Tests/BuildTests/BuildPlanTests.swift index 33937eefc71..72a84e8b0e3 100644 --- a/Tests/BuildTests/BuildPlanTests.swift +++ b/Tests/BuildTests/BuildPlanTests.swift @@ -62,7 +62,7 @@ final class BuildPlanTests: XCTestCase { toolchain: SPMBuildCore.Toolchain = MockToolchain(), flags: BuildFlags = BuildFlags(), shouldLinkStaticSwiftStdlib: Bool = false, - destinationTriple: SPMBuildCore.Triple = hostTriple, + destinationTriple: TSCUtility.Triple = hostTriple, indexStoreMode: BuildParameters.IndexStoreMode = .off, useExplicitModuleBuild: Bool = false ) -> BuildParameters { @@ -81,7 +81,7 @@ final class BuildPlanTests: XCTestCase { } func mockBuildParameters(environment: BuildEnvironment) -> BuildParameters { - let triple: SPMBuildCore.Triple + let triple: TSCUtility.Triple switch environment.platform { case .macOS: triple = Triple.macOS @@ -1869,7 +1869,7 @@ final class BuildPlanTests: XCTestCase { ) XCTAssertNoDiagnostics(diagnostics) - func createResult(for dest: SPMBuildCore.Triple) throws -> BuildPlanResult { + func createResult(for dest: TSCUtility.Triple) throws -> BuildPlanResult { return BuildPlanResult(plan: try BuildPlan( buildParameters: mockBuildParameters(destinationTriple: dest), graph: graph, diagnostics: diagnostics, @@ -2313,7 +2313,7 @@ final class BuildPlanTests: XCTestCase { ]) } - func testBinaryTargets(platform: String, arch: String, destinationTriple: SPMBuildCore.Triple) + func testBinaryTargets(platform: String, arch: String, destinationTriple: TSCUtility.Triple) throws { let fs = InMemoryFileSystem(emptyFiles: "/Pkg/Sources/exe/main.swift", @@ -2458,9 +2458,9 @@ final class BuildPlanTests: XCTestCase { func testBinaryTargets() throws { try testBinaryTargets(platform: "macos", arch: "x86_64", destinationTriple: .macOS) - let arm64Triple = try SPMBuildCore.Triple("arm64-apple-macosx") + let arm64Triple = try TSCUtility.Triple("arm64-apple-macosx") try testBinaryTargets(platform: "macos", arch: "arm64", destinationTriple: arm64Triple) - let arm64eTriple = try SPMBuildCore.Triple("arm64e-apple-macosx") + let arm64eTriple = try TSCUtility.Triple("arm64e-apple-macosx") try testBinaryTargets(platform: "macos", arch: "arm64e", destinationTriple: arm64eTriple) } @@ -2594,7 +2594,7 @@ fileprivate extension TargetBuildDescription { } } -fileprivate extension SPMBuildCore.Triple { +fileprivate extension TSCUtility.Triple { static let x86_64Linux = try! Triple("x86_64-unknown-linux-gnu") static let arm64Linux = try! Triple("aarch64-unknown-linux-gnu") static let arm64Android = try! Triple("aarch64-unknown-linux-android") diff --git a/swift-tools-support-core/Sources/TSCUtility/CMakeLists.txt b/swift-tools-support-core/Sources/TSCUtility/CMakeLists.txt index f10d56bb70d..c0492d11163 100644 --- a/swift-tools-support-core/Sources/TSCUtility/CMakeLists.txt +++ b/swift-tools-support-core/Sources/TSCUtility/CMakeLists.txt @@ -32,6 +32,7 @@ add_library(TSCUtility SimplePersistence.swift StringExtensions.swift StringMangling.swift + Triple.swift URL.swift Verbosity.swift Version.swift diff --git a/Sources/SPMBuildCore/Triple.swift b/swift-tools-support-core/Sources/TSCUtility/Triple.swift similarity index 100% rename from Sources/SPMBuildCore/Triple.swift rename to swift-tools-support-core/Sources/TSCUtility/Triple.swift