Move UserToolchain and Destination

Purpose of this is to make libSwift easier to use for parsing manifests.

Author: neonichu

Sources/Commands/SwiftTestTool.swift

@@ -14,6 +14,7 @@ import Basic
 import Build
 import Utility
 import PackageGraph
+import Workspace
 
 import func POSIX.exit
 

Sources/TestSupport/Resources.swift

@@ -13,6 +13,7 @@ import Build
 import Foundation
 import Commands
 import PackageLoading
+import Workspace
 
 #if os(macOS)
 private func bundleRoot() -> AbsolutePath {

Sources/Commands/Destination.swift renamed to Sources/Workspace/Destination.swift

@@ -0,0 +1,23 @@
+/*
+ This source file is part of the Swift.org open source project
+
+ Copyright (c) 2014 - 2018 Apple Inc. and the Swift project authors
+ Licensed under Apache License v2.0 with Runtime Library Exception
+
+ See http://swift.org/LICENSE.txt for license information
+ See http://swift.org/CONTRIBUTORS.txt for Swift project authors
+*/
+
+enum Error: Swift.Error {
+    /// Couldn't find all tools needed by the package manager.
+    case invalidToolchain(problem: String)
+}
+
+extension Error: CustomStringConvertible {
+    var description: String {
+        switch self {
+        case .invalidToolchain(let problem):
+            return problem
+        }
+    }
+}

Sources/Workspace/Error.swift

@@ -61,19 +61,19 @@ public final class UserToolchain: Toolchain {
     /// Path to the xctest utility.
     ///
     /// This is only present on macOS.
-    let xctest: AbsolutePath?
+    public let xctest: AbsolutePath?
 
     /// Path to llbuild.
-    let llbuild: AbsolutePath
+    public let llbuild: AbsolutePath
 
     /// The compilation destination object.
-    let destination: Destination
+    public let destination: Destination
 
     /// Search paths from the PATH environment variable.
     let envSearchPaths: [AbsolutePath]
 
     /// Returns the runtime library for the given sanitizer.
-    func runtimeLibrary(for sanitizer: Sanitizer) throws -> AbsolutePath {
+    public func runtimeLibrary(for sanitizer: Sanitizer) throws -> AbsolutePath {
         // FIXME: This is only for SwiftPM development time support. It is OK
         // for now but we shouldn't need to resolve the symlink.  We need to lay
         // down symlinks to runtimes in our fake toolchain as part of the

Sources/Commands/UserToolchain.swift renamed to Sources/Workspace/UserToolchain.swift

@@ -13,6 +13,7 @@ import XCTest
 import TestSupport
 import Basic
 import Commands
+import Workspace
 
 struct BuildResult {
     let output: String

Tests/CommandsTests/BuildToolTests.swift

@@ -13,6 +13,7 @@ import Commands
 import TestSupport
 import Basic
 import Utility
+import Workspace
 
 class BuildPerfTests: XCTestCasePerf {
 

Tests/FunctionalPerformanceTests/BuildPerfTests.swift

@@ -15,6 +15,7 @@ import Basic
 import PackageModel
 import SourceControl
 import Utility
+import Workspace
 
 typealias Process = Basic.Process
 

Tests/FunctionalTests/CFamilyTargetTests.swift

@@ -14,6 +14,7 @@ import Basic
 import Commands
 import TestSupport
 import SourceControl
+import Workspace
 
 class DependencyResolutionTests: XCTestCase {
     func testInternalSimple() {

Tests/FunctionalTests/DependencyResolutionTests.swift

@@ -11,11 +11,11 @@
 import XCTest
 import TestSupport
 import Basic
-import struct Commands.Destination
 import PackageModel
 import Utility
 import SPMLibc
 import class Foundation.ProcessInfo
+import Workspace
 
 typealias ProcessID = Basic.Process.ProcessID
 

Tests/FunctionalTests/MiscellaneousTests.swift

@@ -13,6 +13,7 @@ import Commands
 import TestSupport
 import Basic
 import Utility
+import Workspace
 
 class ModuleMapsTestCase: XCTestCase {
 

Tests/FunctionalTests/ModuleMapTests.swift

@@ -13,6 +13,7 @@ import TestSupport
 import XCTest
 import Utility
 import Commands
+import Workspace
 
 class SwiftPMXCTestHelperTests: XCTestCase {
     func testBasicXCTestHelper() {

Tests/FunctionalTests/SwiftPMXCTestHelperTests.swift

@@ -16,6 +16,7 @@ import TestSupport
 import Commands
 import PackageModel
 import SourceControl
+import Workspace
 
 class ToolsVersionTests: XCTestCase {