Make get() return root package and external dependency packages

Author: bhargavg

Sources/Get/get().swift

@@ -17,17 +17,22 @@ import Utility
  - Throws: Error.InvalidDependencyGraph
  - Returns: The modules that this manifest requires building
 */
-public func get(manifest: Manifest, manifestParser: (path: String, url: String) throws -> Manifest) throws -> [Package] {
+public func get(manifest: Manifest, manifestParser: (path: String, url: String) throws -> Manifest) throws -> (rootPackage: Package, externalPackages:[Package]) {
     let dir = Path.join(manifest.path.parentDirectory, "Packages")
     let box = PackagesDirectory(prefix: dir, manifestParser: manifestParser)
 
     //TODO don't lose the dependency information during the Fetcher process!
-
-    let pkgs = try box.recursivelyFetch(manifest.dependencies) + [Package(manifest: manifest, url: manifest.path.parentDirectory)]
+    
+    let rootPackage = Package(manifest: manifest, url: manifest.path.parentDirectory)
+    let extPackages = try box.recursivelyFetch(manifest.dependencies)
+    
+    let pkgs = extPackages + [rootPackage]
+    
     for pkg in pkgs {
         pkg.dependencies = pkg.manifest.package.dependencies.map{ dep in pkgs.pick{ dep.url == $0.url }! }
     }
-    return pkgs
+    
+    return (rootPackage, extPackages)
 }
 
 //TODO normalize urls eg http://github.com -> https://github.com

Sources/Transmute/transmute().swift

@@ -12,17 +12,19 @@ import PackageType
 import Utility
 import func libc.exit
 
-public func transmute(packages: [Package], rootdir: String) throws -> (modules: [Module], externalModules: [Module], products: [Product]) {
+public func transmute(rootPackage: Package, externalPackages: [Package]) throws -> (modules: [Module], externalModules: [Module], products: [Product]) {
 
     var products: [Product] = []
     var map: [Package: [Module]] = [:]
+    
+    let packages = externalPackages + [rootPackage]
 
     for package in packages {
 
         let modules: [Module]
         do {
             modules = try package.modules()
-        } catch Package.ModuleError.NoModules(let pkg) where pkg.path == rootdir {
+        } catch Package.ModuleError.NoModules(let pkg) where pkg === rootPackage {
             //Ignore and print warning if root package doesn't contain any sources
             print("warning: root package '\(pkg)' does not contain any sources")
             if packages.count == 1 { exit(0) } //Exit now if there is no more packages 
@@ -66,10 +68,8 @@ public func transmute(packages: [Package], rootdir: String) throws -> (modules:
     // ensure modules depend on the modules of any dependent packages
     fillModuleGraph(packages, modulesForPackage: { map[$0]! })
 
-    let depPackages = packages.filter{ $0.path != rootdir }
-
     let modules = recursiveDependencies(packages.flatMap{ map[$0] ?? [] })
-    let extModules = recursiveDependencies(depPackages.flatMap{ map[$0] ?? [] })
+    let externalModules = recursiveDependencies(externalPackages.flatMap{ map[$0] ?? [] })
 
-    return (modules, extModules, products)
+    return (modules, externalModules, products)
 }

Sources/swift-build/main.swift

@@ -58,16 +58,16 @@ do {
         return try Manifest(path: path, baseURL: baseURL, swiftc: Toolchain.swiftc, libdir: libdir)
     }
 
-    func fetch(root: String) throws -> [Package] {
+    func fetch(root: String) throws -> (rootPackage: Package, externalPackages:[Package]) {
         let manifest = try parseManifest(path: root, baseURL: root)
         return try get(manifest, manifestParser: parseManifest)
     }
 
     switch mode {
         case .Build(let conf):
             let dirs = try directories()
-            let packages = try fetch(dirs.root)
-            let (modules, externalModules, products) = try transmute(packages, rootdir: dirs.root)
+            let (rootPackage, externalPackages) = try fetch(dirs.root)
+            let (modules, externalModules, products) = try transmute(rootPackage, externalPackages: externalPackages)
             let yaml = try describe(dirs.build, conf, modules, products, Xcc: opts.Xcc, Xld: opts.Xld, Xswiftc: opts.Xswiftc)
             try build(YAMLPath: yaml, target: "default")
 
@@ -92,15 +92,15 @@ do {
 
         case .GenerateXcodeproj(let outpath):
             let dirs = try directories()
-            let packages = try fetch(dirs.root)
-            let (modules, externalModules, products) = try transmute(packages, rootdir: dirs.root)
+            let (rootPackage, externalPackages) = try fetch(dirs.root)
+            let (modules, externalModules, products) = try transmute(rootPackage, externalPackages: externalPackages)
 
             let swiftModules = modules.flatMap{ $0 as? SwiftModule }
             let externalSwiftModules = externalModules.flatMap{ $0 as? SwiftModule }
 
             let projectName: String
             let dstdir: String
-            let packageName = packages.last!.name  //FIXME coincidental dependency on order
+            let packageName = rootPackage.name
 
             switch outpath {
             case let outpath? where outpath.hasSuffix(".xcodeproj"):

Tests/Transmute/ModuleTests.swift

@@ -200,8 +200,8 @@ extension ModuleTests {
         fixture(name: "Miscellaneous/PackageType") { prefix in
             let prefix = Path.join(prefix, "App")
             let manifest = try Manifest(path: prefix)
-            let packages = try get(manifest, manifestParser: { try Manifest(path: $0, baseURL: $1) })
-            let (modules, _,  _) = try transmute(packages, rootdir: prefix)
+            let (rootPackage, externalPackages) = try get(manifest, manifestParser: { try Manifest(path: $0, baseURL: $1) })
+            let (modules, _,  _) = try transmute(rootPackage, externalPackages: externalPackages)
 
             XCTAssertEqual(modules.count, 3)
             XCTAssertEqual(recursiveDependencies(modules).count, 3)
@@ -211,8 +211,8 @@ extension ModuleTests {
         fixture(name: "ModuleMaps/Direct") { prefix in
             let prefix = Path.join(prefix, "App")
             let manifest = try Manifest(path: prefix)
-            let packages = try get(manifest, manifestParser: { try Manifest(path: $0, baseURL: $1) })
-            let (modules, _, _) = try transmute(packages, rootdir: prefix)
+            let (rootPackage, externalPackages) = try get(manifest, manifestParser: { try Manifest(path: $0, baseURL: $1) })
+            let (modules, _,  _) = try transmute(rootPackage, externalPackages: externalPackages)
 
             XCTAssertEqual(modules.count, 2)
             XCTAssertTrue(modules.first is CModule)