swiftlang · Apr 29, 2019 · Apr 30, 2019 · May 1, 2019 · May 1, 2019 · May 1, 2019
Showing with 29 additions and 13 deletions.

+3 −3 Package.swift

+6 −1 Sources/SKCore/BuildSetup.swift

+12 −8 Sources/SKSwiftPMWorkspace/SwiftPMWorkspace.swift

+8 −1 Sources/sourcekit-lsp/main.swift
diff --git a/Package.swift b/Package.swift
@@ -75,7 +75,7 @@ let package = Package(
       // useful to any Swift package. Similar in spirit to SwiftPM's Basic module.
       .target(
         name: "SKSupport",
-        dependencies: ["SPMUtility"]),
+        dependencies: ["SwiftPM-auto", "SPMUtility"]),
       .testTarget(
         name: "SKSupportTests",
         dependencies: ["SKSupport", "SKTestSupport"]),
@@ -97,8 +97,8 @@ import Darwin.C
 if getenv("SWIFTCI_USE_LOCAL_DEPS") == nil {
   // Building standalone.
   package.dependencies += [
-    .package(url: "https://github.com/apple/indexstore-db.git", .branch("master")),
-    .package(url: "https://github.com/apple/swift-package-manager.git", .branch("master")),
+    .package(url: "https://github.com/apple/indexstore-db.git", .branch("swift-5.1-branch")),
+    .package(url: "https://github.com/swift-embedded/swift-package-manager.git", .branch("embedded-5.1")),
   ]
 } else {
   package.dependencies += [

diff --git a/Sources/SKCore/BuildSetup.swift b/Sources/SKCore/BuildSetup.swift
@@ -11,6 +11,7 @@
 //===----------------------------------------------------------------------===//
 
 import Basic
+import Workspace
 import SPMUtility
 import SKSupport
 
@@ -31,9 +32,13 @@ public struct BuildSetup {
   /// Additional build flags
   public let flags: BuildFlags
 
-  public init(configuration: BuildConfiguration, path: AbsolutePath?, flags: BuildFlags) {
+  /// Custom compilation destination, if different from host
+  public let customDestination: Destination?
+
+  public init(configuration: BuildConfiguration, path: AbsolutePath?, flags: BuildFlags, customDestination: Destination? = nil) {
     self.configuration = configuration
     self.path = path
     self.flags = flags
+    self.customDestination = customDestination
   }
 }
diff --git a/Sources/SKSwiftPMWorkspace/SwiftPMWorkspace.swift b/Sources/SKSwiftPMWorkspace/SwiftPMWorkspace.swift
@@ -73,22 +73,25 @@ public final class SwiftPMWorkspace {
         throw Error.cannotDetermineHostToolchain
     }
 
-    let destination = try Destination.hostDestination(destinationToolchainBinDir)
-    let toolchain = try UserToolchain(destination: destination)
-
     let buildPath: AbsolutePath = buildSetup.path ?? packageRoot.appending(component: ".build")
 
+    let hostDestination = try Destination.hostDestination(destinationToolchainBinDir)
+    let manifestToolchain = try UserToolchain(destination: hostDestination)
+    let buildDestination = try? Destination(fromFile: buildPath.appending(component: "destination.json"),
+                                            fileSystem: fileSystem)
+    let targetDestination = buildSetup.customDestination ?? buildDestination ?? hostDestination
+    let targetToolchain = try UserToolchain(destination: targetDestination)
+
+
     self.workspace = Workspace(
       dataPath: buildPath,
       editablesPath: packageRoot.appending(component: "Packages"),
       pinsFile: packageRoot.appending(component: "Package.resolved"),
-      manifestLoader: ManifestLoader(manifestResources: toolchain.manifestResources, cacheDir: buildPath),
+      manifestLoader: ManifestLoader(manifestResources: manifestToolchain.manifestResources, cacheDir: buildPath),
       delegate: BuildSettingProviderWorkspaceDelegate(),
       fileSystem: fileSystem,
       skipUpdate: true)
 
-    let triple = Triple.hostTriple
-
     let swiftPMConfiguration: PackageModel.BuildConfiguration
     switch buildSetup.configuration {
     case .debug:
@@ -98,9 +101,10 @@ public final class SwiftPMWorkspace {
     }
 
     self.buildParameters = BuildParameters(
-      dataPath: buildPath.appending(component: triple.tripleString),
+      dataPath: buildPath.appending(component: targetDestination.target.tripleString),
       configuration: swiftPMConfiguration,
-      toolchain: toolchain,
+      toolchain: targetToolchain,
+      destinationTriple: targetDestination.target,
       flags: buildSetup.flags)
 
     self.packageGraph = PackageGraph(rootPackages: [], requiredDependencies: [])

diff --git a/Sources/sourcekit-lsp/main.swift b/Sources/sourcekit-lsp/main.swift
@@ -20,6 +20,7 @@ import Dispatch
 import Basic
 import SPMUtility
 import Foundation
+import Workspace
 import sourcekitd // Not needed here, but fixes debugging...
 
 func parseArguments() throws -> BuildSetup {
@@ -28,6 +29,7 @@ func parseArguments() throws -> BuildSetup {
   let loggingOption = parser.add(option: "--log-level", kind: LogLevel.self, usage: "Set the logging level (debug|info|warning|error) [default: \(LogLevel.default)]")
   let buildConfigurationOption = parser.add(option: "--configuration", shortName: "-c", kind: BuildConfiguration.self, usage: "Build with configuration (debug|release) [default: debug]")
   let buildPathOption = parser.add(option: "--build-path", kind: PathArgument.self, usage: "Specify build/cache directory")
+  let destinationOption = parser.add(option: "--destination", kind: PathArgument.self)
   let buildFlagsCc = parser.add(option: "-Xcc", kind: [String].self, strategy: .oneByOne, usage: "Pass flag through to all C compiler invocations")
   let buildFlagsCxx = parser.add(option: "-Xcxx", kind: [String].self, strategy: .oneByOne, usage: "Pass flag through to all C++ compiler invocations")
   let buildFlagsLinker = parser.add(option: "-Xlinker", kind: [String].self, strategy: .oneByOne, usage: "Pass flag through to all linker invocations")
@@ -41,6 +43,10 @@ func parseArguments() throws -> BuildSetup {
   buildFlags.linkerFlags = parsedArguments.get(buildFlagsLinker) ?? []
   buildFlags.swiftCompilerFlags = parsedArguments.get(buildFlagsSwift) ?? []
 
+  let customDestination = try parsedArguments.get(destinationOption).map {
+    return try Destination(fromFile: $0.path)
+  }
+
   if let logLevel = parsedArguments.get(loggingOption) {
     Logger.shared.currentLevel = logLevel
   } else {
@@ -50,7 +56,8 @@ func parseArguments() throws -> BuildSetup {
   return BuildSetup(
     configuration: parsedArguments.get(buildConfigurationOption) ?? BuildSetup.default.configuration,
     path: parsedArguments.get(buildPathOption)?.path,
-    flags: buildFlags)
+    flags: buildFlags,
+    customDestination: customDestination)
 }
 
 let clientConnection = JSONRPCConection(inFD: STDIN_FILENO, outFD: STDOUT_FILENO, closeHandler: {