Merge pull request swiftlang#11 from benlangmuir/index-store-path-api

benlangmuir · web-flow · commit d0803e999a15 · 2018-11-16T17:01:26.000-08:00
[swiftpm] Stop hard-coding the index store path
diff --git a/Sources/SKSwiftPMWorkspace/SwiftPMWorkspace.swift b/Sources/SKSwiftPMWorkspace/SwiftPMWorkspace.swift
@@ -172,7 +172,7 @@ extension SwiftPMWorkspace: ExternalWorkspace, BuildSettingsProvider {
   }
 
   public var indexStorePath: AbsolutePath? {
-    return buildPath.appending(components: "index", "store")
+    return buildParameters.indexStoreMode == .off ? nil : buildParameters.indexStore
   }
 
   public var indexDatabasePath: AbsolutePath? {

Original file line number	Diff line number	Diff line change
`@@ -172,7 +172,7 @@ extension SwiftPMWorkspace: ExternalWorkspace, BuildSettingsProvider {`
`172`	`172`	`}`
`173`	`173`
`174`	`174`	`public var indexStorePath: AbsolutePath? {`
`175`		`- return buildPath.appending(components: "index", "store")`
	`175`	`+ return buildParameters.indexStoreMode == .off ? nil : buildParameters.indexStore`
`176`	`176`	`}`
`177`	`177`
`178`	`178`	`public var indexDatabasePath: AbsolutePath? {`