Merge pull request #430 from 3405691582/PlatformBuildPathComponent

neonichu · web-flow · commit 8b71b0179060 · 2021-10-18T10:35:22.000-07:00
Use new way when building paths based on triple.
diff --git a/Sources/SKSwiftPMWorkspace/SwiftPMWorkspace.swift b/Sources/SKSwiftPMWorkspace/SwiftPMWorkspace.swift
@@ -117,7 +117,7 @@ public final class SwiftPMWorkspace {
     }
 
     self.buildParameters = BuildParameters(
-        dataPath: location.workingDirectory.appending(component: triple.tripleString),
+        dataPath: location.workingDirectory.appending(component: triple.platformBuildPathComponent()),
         configuration: buildConfiguration,
         toolchain: toolchain,
         flags: buildSetup.flags
diff --git a/Tests/SKSwiftPMWorkspaceTests/SwiftPMWorkspaceTests.swift b/Tests/SKSwiftPMWorkspaceTests/SwiftPMWorkspaceTests.swift
@@ -605,5 +605,5 @@ private func buildPath(
   triple: Triple) -> AbsolutePath
 {
   let buildPath = config.path ?? root.appending(component: ".build")
-  return buildPath.appending(components: triple.tripleString, "\(config.configuration)")
+  return buildPath.appending(components: triple.platformBuildPathComponent(), "\(config.configuration)")
 }

Original file line number	Diff line number	Diff line change
`@@ -117,7 +117,7 @@ public final class SwiftPMWorkspace {`
`117`	`117`	`}`
`118`	`118`
`119`	`119`	`self.buildParameters = BuildParameters(`
`120`		`- dataPath: location.workingDirectory.appending(component: triple.tripleString),`
	`120`	`+ dataPath: location.workingDirectory.appending(component: triple.platformBuildPathComponent()),`
`121`	`121`	`configuration: buildConfiguration,`
`122`	`122`	`toolchain: toolchain,`
`123`	`123`	`flags: buildSetup.flags`
Original file line number	Diff line number	Diff line change
`@@ -605,5 +605,5 @@ private func buildPath(`
`605`	`605`	`triple: Triple) -> AbsolutePath`
`606`	`606`	`{`
`607`	`607`	`let buildPath = config.path ?? root.appending(component: ".build")`
`608`		`- return buildPath.appending(components: triple.tripleString, "\(config.configuration)")`
	`608`	`+ return buildPath.appending(components: triple.platformBuildPathComponent(), "\(config.configuration)")`
`609`	`609`	`}`