cleanup

Author: tomerd

Sources/PackageLoading/ManifestLoader.swift

@@ -695,14 +695,14 @@ public final class ManifestLoader: ManifestLoaderProtocol {
         let macOSPackageDescriptionPath: AbsolutePath
         // if runtimePath is set to "PackageFrameworks" that means we could be developing SwiftPM in Xcode
         // which produces a framework for dynamic package products.
-        if runtimePath.basename == "PackageFrameworks" {
+        if runtimePath.extension == "framework" {
             cmd += [
-                "-F", runtimePath.pathString,
+                "-F", runtimePath.parentDirectory.pathString,
                 "-framework", "PackageDescription",
-                "-Xlinker", "-rpath", "-Xlinker", runtimePath.pathString,
+                "-Xlinker", "-rpath", "-Xlinker", runtimePath.parentDirectory.pathString,
             ]
 
-            macOSPackageDescriptionPath = runtimePath.appending(RelativePath("PackageDescription.framework/PackageDescription"))
+            macOSPackageDescriptionPath = runtimePath.appending(component: "PackageDescription")
         } else {
             cmd += [
                 "-L", runtimePath.pathString,
@@ -715,7 +715,7 @@ public final class ManifestLoader: ManifestLoaderProtocol {
 #endif
 
             // note: this is not correct for all platforms, but we only actually use it on macOS.
-            macOSPackageDescriptionPath = runtimePath.appending(RelativePath("libPackageDescription.dylib"))
+            macOSPackageDescriptionPath = runtimePath.appending(component: "libPackageDescription.dylib")
         }
 
         // Use the same minimum deployment target as the PackageDescription library (with a fallback of 10.15).
@@ -854,8 +854,8 @@ public final class ManifestLoader: ManifestLoaderProtocol {
         cmd += ["-swift-version", toolsVersion.swiftLanguageVersion.rawValue]
         // if runtimePath is set to "PackageFrameworks" that means we could be developing SwiftPM in Xcode
         // which produces a framework for dynamic package products.
-        if runtimePath.basename == "PackageFrameworks" {
-            cmd += ["-I", runtimePath.parentDirectory.pathString]
+        if runtimePath.extension == "framework" {
+            cmd += ["-I", runtimePath.parentDirectory.parentDirectory.pathString]
         } else {
             cmd += ["-I", runtimePath.pathString]
         }

Sources/PackageModel/ToolchainConfiguration.swift

@@ -95,7 +95,7 @@ extension ToolchainConfiguration {
             )
         }
 
-        fileprivate init(swiftCompilerPath: AbsolutePath) {
+        public init(swiftCompilerPath: AbsolutePath) {
             let rootPath = swiftCompilerPath.parentDirectory.parentDirectory.appending(components: "lib", "swift", "pm")
             self.init(root: rootPath)
         }

Sources/Workspace/DefaultPluginScriptRunner.swift

@@ -60,13 +60,13 @@ public struct DefaultPluginScriptRunner: PluginScriptRunner {
         let macOSPackageDescriptionPath: AbsolutePath
         // if runtimePath is set to "PackageFrameworks" that means we could be developing SwiftPM in Xcode
         // which produces a framework for dynamic package products.
-        if runtimePath.basename == "PackageFrameworks" {
+        if runtimePath.extension == "framework" {
             command += [
-                "-F", runtimePath.pathString,
+                "-F", runtimePath.parentDirectory.pathString,
                 "-framework", "PackagePlugin",
-                "-Xlinker", "-rpath", "-Xlinker", runtimePath.pathString,
+                "-Xlinker", "-rpath", "-Xlinker", runtimePath.parentDirectory.pathString,
             ]
-            macOSPackageDescriptionPath = runtimePath.appending(RelativePath("PackagePlugin.framework/PackagePlugin"))
+            macOSPackageDescriptionPath = runtimePath.appending(component: "PackagePlugin")
         } else {
             command += [
                 "-L", runtimePath.pathString,
@@ -79,7 +79,7 @@ public struct DefaultPluginScriptRunner: PluginScriptRunner {
             #endif
 
             // note: this is not correct for all platforms, but we only actually use it on macOS.
-            macOSPackageDescriptionPath = runtimePath.appending(RelativePath("libPackagePlugin.dylib"))
+            macOSPackageDescriptionPath = runtimePath.appending(component: "libPackagePlugin.dylib")
         }
 
         // Use the same minimum deployment target as the PackageDescription library (with a fallback of 10.15).
@@ -98,8 +98,8 @@ public struct DefaultPluginScriptRunner: PluginScriptRunner {
         command += ["-swift-version", toolsVersion.swiftLanguageVersion.rawValue]
         // if runtimePath is set to "PackageFrameworks" that means we could be developing SwiftPM in Xcode
         // which produces a framework for dynamic package products.
-        if runtimePath.basename == "PackageFrameworks" {
-            command += ["-I", runtimePath.parentDirectory.pathString]
+        if runtimePath.extension == "framework" {
+            command += ["-I", runtimePath.parentDirectory.parentDirectory.pathString]
         } else {
             command += ["-I", runtimePath.pathString]
         }

Sources/Workspace/UserToolchain.swift

@@ -385,20 +385,20 @@ public final class UserToolchain: Toolchain {
             }
         }
 
-        let customSwiftPMLibrariesLocation = try Self.deriveCustomSwiftPMLibrariesLocation(swiftCompilerPath: swiftCompilerPath, destination: destination)
+        let swiftPMLibrariesLocation = try Self.deriveSwiftPMLibrariesLocation(swiftCompilerPath: swiftCompilerPath, destination: destination)
 
         let xctestPath = Self.deriveXCTestPath()
 
         self.configuration = .init(
             swiftCompilerPath: swiftCompilers.manifest,
             swiftCompilerFlags: self.extraSwiftCFlags,
-            swiftPMLibrariesLocation: customSwiftPMLibrariesLocation,
+            swiftPMLibrariesLocation: swiftPMLibrariesLocation,
             sdkRootPath: self.destination.sdk,
             xctestPath: xctestPath
         )
     }
 
-    private static func deriveCustomSwiftPMLibrariesLocation(
+    private static func deriveSwiftPMLibrariesLocation(
         swiftCompilerPath: AbsolutePath,
         destination: Destination
     ) throws -> ToolchainConfiguration.SwiftPMLibrariesLocation? {
@@ -443,8 +443,8 @@ public final class UserToolchain: Toolchain {
         let pluginFrameworksPath = applicationPath.appending(components: "PackageFrameworks", "PackagePlugin.framework")
         if localFileSystem.exists(manifestFrameworksPath) && localFileSystem.exists(pluginFrameworksPath) {
             return .init(
-                manifestAPI: manifestFrameworksPath.parentDirectory,
-                pluginAPI: pluginFrameworksPath.parentDirectory
+                manifestAPI: manifestFrameworksPath,
+                pluginAPI: pluginFrameworksPath
             )
         }
 
@@ -456,8 +456,8 @@ public final class UserToolchain: Toolchain {
             )
         }
 
-        // default case - no custom location which will use the one from the toolchain
-        return nil
+        // we are using a SwiftPM outside a toolchain, use the compiler path to compute the location
+        return .init(swiftCompilerPath: swiftCompilerPath)
     }
 
     // TODO: why is this only required on Windows? is there something better we can do?