Add Dependencies in project group

Author: bhargavg

Sources/Get/get().swift

@@ -21,9 +21,7 @@ public func get(manifest: Manifest, manifestParser: (path: String, url: String)
     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 pkgs = try box.recursivelyFetch(manifest.dependencies) + [Package(manifest: manifest, url: manifest.path.parentDirectory, isSourcePackage: true)]
     for pkg in pkgs {
         pkg.dependencies = pkg.manifest.package.dependencies.map{ dep in pkgs.pick{ dep.url == $0.url }! }
     }

Sources/PackageType/Module.swift

@@ -22,10 +22,16 @@ public class Module {
     */
     public let name: String
     public var dependencies: [Module]  /// in build order
+    public var isExternalDependency: Bool
 
-    public init(name: String) {
+    public init(name: String, isExternalDependency: Bool) {
         self.name = name
         self.dependencies = []
+        self.isExternalDependency = isExternalDependency
+    }
+
+    convenience public init(name: String) {
+        self.init(name: name, isExternalDependency: false)
     }
 
     public var recursiveDependencies: [Module] {
@@ -48,9 +54,9 @@ public func ==(lhs: Module, rhs: Module) -> Bool {
 public class SwiftModule: Module {
     public let sources: Sources
 
-    public init(name: String, sources: Sources) {
+    public init(name: String, sources: Sources, isExternalDependency: Bool) {
         self.sources = sources
-        super.init(name: name)
+        super.init(name: name, isExternalDependency: isExternalDependency)
     }
 
     public enum ModuleType {
@@ -68,16 +74,16 @@ public class SwiftModule: Module {
 public class CModule: Module {
     public let path: String
 
-    public init(name: String, path: String) {
+    public init(name: String, path: String, isExternalDependency: Bool) {
         self.path = path
-        super.init(name: name)
+        super.init(name: name, isExternalDependency: isExternalDependency)
     }
 }
 
 public class TestModule: SwiftModule {
 
     public init(basename: String, sources: Sources) {
-        super.init(name: "\(basename).testsuite", sources: sources)
+        super.init(name: "\(basename).testsuite", sources: sources, isExternalDependency: false)
     }
 
     public var basename: String {

Sources/PackageType/Package.swift

@@ -14,14 +14,20 @@ public class Package {
     public let url: String
     public let path: String
     public let name: String
+    public let isSourcePackage: Bool
     public var dependencies: [Package] = []
     public let manifest: Manifest
 
-    public init(manifest: Manifest, url: String) {
+    convenience public init(manifest: Manifest, url: String) {
+        self.init(manifest: manifest, url: url, isSourcePackage: false)
+    }
+    
+    public init(manifest: Manifest, url: String, isSourcePackage: Bool) {
         self.manifest = manifest
         self.url = url
         self.path = manifest.path.parentDirectory
         self.name = manifest.package.name ?? Package.nameForURL(url)
+        self.isSourcePackage = isSourcePackage
     }
 
     public enum Error: ErrorProtocol {

Sources/Transmute/Package+modules.swift

@@ -16,7 +16,7 @@ extension Package {
     func modules() throws -> [Module] {
 
         guard !Path.join(path, "module.modulemap").isFile else {
-            return [CModule(name: name, path: path)]
+            return [CModule(name: name, path: path, isExternalDependency: !isSourcePackage)]
         }
 
         let srcroot = try sourceRoot()
@@ -38,7 +38,7 @@ extension Package {
         let modules: [Module]
         if maybeModules.isEmpty {
             do {
-                modules = [SwiftModule(name: self.name, sources: try sourcify(srcroot))]
+                modules = [SwiftModule(name: self.name, sources: try sourcify(srcroot), isExternalDependency: !isSourcePackage)]
             } catch Module.Error.NoSources {
                 throw ModuleError.NoModules(self)
             }
@@ -50,7 +50,7 @@ extension Package {
                 } else {
                     name = sources.root.basename
                 }
-                return SwiftModule(name: name, sources: sources)
+                return SwiftModule(name: name, sources: sources, isExternalDependency: !isSourcePackage)
             }
         }
 

Sources/Xcodeproj/Module+PBXProj.swift

@@ -27,16 +27,17 @@ import struct Utility.Toolchain
 import struct Utility.Path
 import PackageType
 
-let rootObjectReference =                           "__RootObject_"
-let rootBuildConfigurationListReference =           "___RootConfs_"
-let rootBuildConfigurationReference =               "_______Debug_"
-let rootGroupReference =                            "___RootGroup_"
-let productsGroupReference =                        "____Products_"
-let sourcesGroupReference =                         "_____Sources_"
-let testsGroupReference =                           "_______Tests_"
-let linkPhaseFileRefPrefix =                        "_LinkFileRef_"
-let sourceGroupFileRefPrefix =                      "__PBXFileRef_"
-let compilePhaseFileRefPrefix =                     "__src_cc_ref_"
+let rootObjectReference =                           "____RootObject_"
+let rootBuildConfigurationListReference =           "_____RootConfs_"
+let rootBuildConfigurationReference =               "_________Debug_"
+let rootGroupReference =                            "_____RootGroup_"
+let productsGroupReference =                        "______Products_"
+let sourcesGroupReference =                         "_______Sources_"
+let dependenciesGroupReference =                    "__Dependencies_"
+let testsGroupReference =                           "_________Tests_"
+let linkPhaseFileRefPrefix =                        "___LinkFileRef_"
+let sourceGroupFileRefPrefix =                      "____PBXFileRef_"
+let compilePhaseFileRefPrefix =                     "____src_cc_ref_"
 
 extension Module {
     var dependencyReference: String        { return "__Dependency_\(c99name)" }

Sources/Xcodeproj/pbxproj().swift

@@ -18,6 +18,7 @@ import Utility
 public func pbxproj(package package: Package, modules: [SwiftModule], products _: [Product], printer print: (String) -> Void) {
 
     let srcroot = package.path
+    let depModules = modules.filter{ $0.isExternalDependency }
     let nontests = modules.filter{ !($0 is TestModule) }
     let tests = modules.filter{ $0 is TestModule }
 
@@ -49,7 +50,7 @@ public func pbxproj(package package: Package, modules: [SwiftModule], products _
 ////// root group
     print("        \(rootGroupReference) = {")
     print("            isa = PBXGroup;")
-    print("            children = (\(sourcesGroupReference), \(testsGroupReference), \(productsGroupReference));")
+    print("            children = (\(sourcesGroupReference), \(dependenciesGroupReference), \(testsGroupReference), \(productsGroupReference));")
     print("            sourceTree = '<group>';")
     print("        };")
 
@@ -149,6 +150,14 @@ public func pbxproj(package package: Package, modules: [SwiftModule], products _
     print("            sourceTree = '<group>';")
     print("        };")
 
+    ////// “Dependencies” group
+    print("        \(dependenciesGroupReference) = {")
+    print("            isa = PBXGroup;")
+    print("            children = (" + depModules.map{ $0.groupReference }.joined(separator: ", ") + ");")
+    print("            name = Dependencies;")
+    print("            sourceTree = '<group>';")
+    print("        };")
+
 ////// “Tests” group
     print("        \(testsGroupReference) = {")
     print("            isa = PBXGroup;")