Merge pull request #690 from aciidb0mb3r/remove-pkg-symlinks

[Workspace] Elimiate creating symlinks in Packages/

Author: aciidgh

Sources/Commands/SwiftTool.swift

@@ -146,14 +146,8 @@ public class SwiftTool<Mode: Argument, OptionType: Options> {
     func loadPackage() throws -> PackageGraph {
         if options.enableNewResolver {
             let workspace = try getActiveWorkspace()
-
             // Fetch and load the package graph.
-            let graph = try workspace.loadPackageGraph()
-
-            // Create the legacy `Packages` subdirectory.
-            try workspace.createPackagesDirectory(graph)
-
-            return graph
+            return try workspace.loadPackageGraph()
         } else {
             // Create the packages directory container.
             let packagesDirectory = PackagesDirectory(root: try getPackageRoot(), manifestLoader: manifestLoader)

Sources/Commands/Workspace.swift

@@ -581,35 +581,6 @@ public class Workspace {
         try saveState()
     }
 
-    /// Create a `Packages` subdirectory.
-    ///
-    /// For migration purposes, creates a "Packages" subdirectory matching the
-    /// historical behavior of the package manager containing symlinks to the
-    /// checkouts for each repository and version.
-    //
-    // FIXME: Eliminate this behavior.
-    func createPackagesDirectory(_ graph: PackageGraph) throws {
-        let packagesDirPath = rootPackagePath.appending(component: "Packages")
-
-        // Remove any existing packages directory.
-        _ = try? removeFileTree(packagesDirPath)
-        try makeDirectories(packagesDirPath)
-
-        // Create links for each versioned dependency.
-        for package in graph.packages {
-            if package == graph.rootPackage {
-                continue
-            }
-
-            let manifest = package.manifest
-            let dependency = dependencyMap[RepositorySpecifier(url: manifest.url)]!
-            if let version = dependency.currentVersion {
-                let name = "\(manifest.package.name)-\(version)"
-                try createSymlink(packagesDirPath.appending(component: name), pointingAt: manifest.path.parentDirectory, relative: true)
-            }
-        }
-    }
-
     /// Loads and returns the root manifest.
     private func loadRootManifest() throws -> Manifest {
         return try manifestLoader.load(packagePath: rootPackagePath, baseURL: rootPackagePath.asString, version: nil)