[Xcodeproj] Generating clibs targets 2

Sources/PackageType/Module.swift

@@ -15,7 +15,14 @@
  TODO should be a protocol
 */
 
-public class Module {
+public protocol ModuleProtocol {
+    var name: String { get }
+    var c99name: String { get }
+    var dependencies: [Module] { get set }
+    var recursiveDependencies: [Module] { get }
+}
+
+public class Module: ModuleProtocol {
     /**
      This name is not the final name in many cases, instead
      use c99name if you need uniqueness.
@@ -56,6 +63,11 @@ extension ModuleTypeProtocol {
     }
 }
 
+
+public protocol XcodeModuleProtocol: ModuleProtocol, ModuleTypeProtocol {
+    var fileType: String { get }
+}
+
 extension Module: Hashable, Equatable {
     public var hashValue: Int { return c99name.hashValue }
 }
@@ -79,6 +91,12 @@ extension SwiftModule: ModuleTypeProtocol {
     }
 }
 
+extension SwiftModule: XcodeModuleProtocol {
+    public var fileType: String {
+        return "sourcecode.swift"
+    }
+}
+
 public class CModule: Module {
     public let path: String
 
@@ -98,6 +116,12 @@ public class ClangModule: CModule {
     }
 }
 
+extension ClangModule: XcodeModuleProtocol {
+    public var fileType: String {
+        return "sourcecode.c.c"
+    }
+}
+
 extension ClangModule: ModuleTypeProtocol {
     public var mainFile: String {
         return "main.c"

Sources/Xcodeproj/Module+PBXProj.swift

@@ -40,7 +40,7 @@ let linkPhaseFileRefPrefix =                        "_LinkFileRef_"
 let sourceGroupFileRefPrefix =                      "__PBXFileRef_"
 let compilePhaseFileRefPrefix =                     "__src_cc_ref_"
 
-extension Module {
+extension XcodeModuleProtocol {
     var dependencyReference: String           { return "__Dependency_\(c99name)" }
     var productReference: String              { return "_____Product_\(c99name)" }
     var targetReference: String               { return "______Target_\(c99name)" }
@@ -52,7 +52,7 @@ extension Module {
     var linkPhaseReference: String            { return "___LinkPhase_\(c99name)" }
 }
 
-func fileRef(forLinkPhaseChild module: Module) -> String {
+func fileRef(forLinkPhaseChild module: XcodeModuleProtocol) -> String {
     return linkPhaseFileRefPrefix + module.c99name
 }
 
@@ -75,28 +75,29 @@ func fileRef(inProjectRoot name: String, srcroot: String) -> (String, String, St
     return ("'\(sourceGroupFileRefPrefix)\(suffix)'", name, Path.join(srcroot, name))
 }
 
-func fileRefs(forModuleSources module: SwiftModule, srcroot: String) -> [(String, String)] {
+func fileRefs(forModuleSources module: XcodeModuleProtocol, srcroot: String) -> [(String, String)] {
     return module.sources.relativePaths.map { relativePath in
         let path = Path.join(module.sources.root, relativePath)
         let suffix = fileRef(suffixForModuleSourceFile: path, srcroot: srcroot)
         return ("'\(sourceGroupFileRefPrefix)\(suffix)'", relativePath)
     }
 }
 
-func fileRefs(forCompilePhaseSourcesInModule module: SwiftModule, srcroot: String) -> [(String, String)] {
+func fileRefs(forCompilePhaseSourcesInModule module: XcodeModuleProtocol, srcroot: String) -> [(String, String)] {
     return fileRefs(forModuleSources: module, srcroot: srcroot).map { ref1, relativePath in
         let path = Path.join(module.sources.root, relativePath)
         let suffix = fileRef(suffixForModuleSourceFile: path, srcroot: srcroot)
         return (ref1, "'\(compilePhaseFileRefPrefix)\(suffix)'")
     }
 }
 
-extension SwiftModule {
+extension XcodeModuleProtocol  {
+
     private var isLibrary: Bool {
         return type == .Library
     }
 
-    var type: String {
+    var productType: String {
         if self is TestModule {
             return "com.apple.product-type.bundle.unit-test"
         } else if isLibrary {
@@ -119,6 +120,8 @@ extension SwiftModule {
         return "compiled.mach-o.\(suffix())"
     }
 
+
+
     var productPath: String {
         if self is TestModule {
             return "\(c99name).xctest"
@@ -130,11 +133,11 @@ extension SwiftModule {
     }
 
     var linkPhaseFileRefs: String {
-        return recursiveDependencies.map{ fileRef(forLinkPhaseChild: $0) }.joined(separator: ", ")
+        return recursiveDependencies.flatMap { $0 as? XcodeModuleProtocol }.map{ fileRef(forLinkPhaseChild: $0) }.joined(separator: ", ")
     }
 
     var nativeTargetDependencies: String {
-        return dependencies.map{ $0.dependencyReference }.joined(separator: ", ")
+        return dependencies.flatMap { $0 as? XcodeModuleProtocol }.map{ $0.dependencyReference }.joined(separator: ", ")
     }
 
     var productName: String {
@@ -211,7 +214,7 @@ extension SwiftModule {
 }
 
 
-extension SwiftModule {
+extension XcodeModuleProtocol {
     var blueprintIdentifier: String {
         return targetReference
     }

Sources/Xcodeproj/generate().swift

@@ -16,7 +16,7 @@ import POSIX
  Generates an xcodeproj at the specified path.
  - Returns: the path to the generated project
 */
-public func generate(dstdir dstdir: String, projectName: String, srcroot: String, modules: [SwiftModule], externalModules: [SwiftModule], products: [Product]) throws -> String {
+public func generate(dstdir dstdir: String, projectName: String, srcroot: String, modules: [XcodeModuleProtocol], externalModules: [XcodeModuleProtocol], products: [Product]) throws -> String {
 
     let xcodeprojName = "\(projectName).xcodeproj"
     let xcodeprojPath = try mkdir(dstdir, xcodeprojName)

Sources/Xcodeproj/pbxproj().swift

@@ -15,9 +15,10 @@
 import PackageType
 import Utility
 
-public func pbxproj(srcroot srcroot: String, projectRoot: String, modules: [SwiftModule], externalModules: [SwiftModule], products _: [Product], printer print: (String) -> Void) {
+public func pbxproj(srcroot srcroot: String, projectRoot: String, modules: [XcodeModuleProtocol], externalModules: [XcodeModuleProtocol], products _: [Product], printer print: (String) -> Void) {
 
-    let rootModulesSet = Set(modules).subtract(Set(externalModules))
+    // let rootModulesSet = Set(modules).subtract(Set(externalModules))
+    let rootModulesSet = modules
     let nonTestRootModules = rootModulesSet.filter{ !($0 is TestModule) }
     let (tests, nonTests) = modules.partition{ $0 is TestModule }
 
@@ -79,7 +80,7 @@ public func pbxproj(srcroot srcroot: String, projectRoot: String, modules: [Swif
         for (ref, path) in fileRefs(forModuleSources: module, srcroot: srcroot) {
             print("        \(ref) = {")
             print("            isa = PBXFileReference;")
-            print("            lastKnownFileType = sourcecode.swift;")
+            print("            lastKnownFileType = \(module.fileType);")
             print("            name = '\(Path(path).relative(to: module.sources.root))';")
             print("            sourceTree = '<group>';")
             print("        };")
@@ -95,7 +96,7 @@ public func pbxproj(srcroot srcroot: String, projectRoot: String, modules: [Swif
         print("            name = \(module.name);")
         print("            productName = \(module.c99name);")
         print("            productReference = \(module.productReference);")
-        print("            productType = '\(module.type)';")
+        print("            productType = '\(module.productType)';")
         print("        };")
 
         // the product file reference

Sources/Xcodeproj/xcscheme().swift

@@ -10,7 +10,7 @@
 
 import PackageType
 
-func xcscheme(container container: String, modules: [SwiftModule], printer print: (String) -> Void) {
+func xcscheme(container container: String, modules: [XcodeModuleProtocol], printer print: (String) -> Void) {
     print("<?xml version=\"1.0\" encoding=\"UTF-8\"?>")
     print("<Scheme LastUpgradeVersion = \"9999\" version = \"1.3\">")
     print("  <BuildAction parallelizeBuildables = \"YES\" buildImplicitDependencies = \"YES\">")

Sources/swift-build/main.swift

@@ -95,8 +95,8 @@ do {
             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 xcodeModules = modules.flatMap { $0 as? XcodeModuleProtocol }
+            let externalXcodeModules  = externalModules.flatMap { $0 as? XcodeModuleProtocol }
 
             let projectName: String
             let dstdir: String
@@ -115,7 +115,7 @@ do {
                 projectName = packageName
             }
 
-            let outpath = try Xcodeproj.generate(dstdir: dstdir, projectName: projectName, srcroot: dirs.root, modules: swiftModules, externalModules: externalSwiftModules, products: products)
+            let outpath = try Xcodeproj.generate(dstdir: dstdir, projectName: projectName, srcroot: dirs.root, modules: xcodeModules, externalModules: externalXcodeModules, products: products)
 
             print("generated:", outpath.prettied)
     }

Tests/Xcodeproj/TestGeneration.swift

@@ -42,8 +42,8 @@ class TestGeneration: XCTestCase {
 
     func testXcodeBuildCanParseIt() {
         mktmpdir { dstdir in
-            func dummy() -> [SwiftModule] {
-                return [SwiftModule(name: "DummyModuleName", sources: Sources(paths: [], root: dstdir))]
+            func dummy() -> [XcodeModuleProtocol] {
+                return [SwiftModule(name: "DummyModuleName", sources: Sources(paths: [], root: dstdir)) as! XcodeModuleProtocol]
             }
 
             let projectName = "DummyProjectName"