Generate module maps in build dir

Author: aciidgh

Sources/Build/Buildable.swift

@@ -9,20 +9,43 @@
 */
 
 import PackageType
+import struct Utility.Path
 
 protocol Buildable {
     var targetName: String { get }
     var isTest: Bool { get }
 }
 
+extension CModule {
+    func workingDirectory(prefix: String) -> String {
+        return Path.join(prefix, "\(c99name).build")
+    }
+}
+
 extension Module: Buildable {
     var isTest: Bool {
         return self is TestModule
     }
 
-    var Xcc: [String] {
+    func XccFlagsForPrefix(prefix: String) -> [String] {
         return recursiveDependencies.flatMap { module -> [String] in
-            if let module = module as? CModule {
+            if let module = module as? ClangModule {
+                var moduleMap: String? = nil
+                
+                if module.moduleMapPath.isFile {
+                    moduleMap = module.moduleMapPath
+                }
+    
+                let genModuleMap = Path.join(module.workingDirectory(prefix), module.moduleMap)
+                if genModuleMap.isFile {
+                    moduleMap = genModuleMap
+                }
+                //No module map found, return with no args
+                if let moduleMap = moduleMap {
+                    return ["-Xcc", "-fmodule-map-file=\(moduleMap)"]
+                }
+                return []
+            } else if let module = module as? CModule {
                 return ["-Xcc", "-fmodule-map-file=\(module.moduleMapPath)"]
             } else {
                 return []

Sources/Build/Command.compile(ClangModule).swift

@@ -15,9 +15,14 @@ import POSIX
 //FIXME: Incremental builds
 
 extension Command {
-    static func compile(clangModule module: ClangModule, externalModules: Set<Module>, configuration conf: Configuration, prefix: String) -> (Command, Command) {
-
-        let wd = Path.join(prefix, "\(module.c99name).build")
+    static func compile(clangModule module: ClangModule, externalModules: Set<Module>, configuration conf: Configuration, prefix: String) throws -> (Command, Command) {
+        
+        let wd = module.workingDirectory(prefix)
+        
+        if module.type == .Library {
+            try module.generateModuleMap(inDir: wd)
+        }
+        
         let mkdir = Command.createDirectory(wd)
 
         let inputs = module.dependencies.map{ $0.targetName } + module.sources.paths + [mkdir.node]

Sources/Build/Command.compile(SwiftModule).swift

@@ -14,7 +14,7 @@ import Utility
 extension Command {
     static func compile(swiftModule module: SwiftModule, configuration conf: Configuration, prefix: String, otherArgs: [String]) throws -> (Command, [Command]) {
 
-        let otherArgs = otherArgs + module.Xcc
+        let otherArgs = otherArgs + module.XccFlagsForPrefix(prefix)
 
         func cmd(tool: ToolProtocol) -> Command {
             return Command(node: module.targetName, tool: tool)

Sources/Build/describe().swift

@@ -40,11 +40,7 @@ public func describe(prefix: String, _ conf: Configuration, _ modules: [Module],
             targets.append(compile, for: module)
 
         case let module as ClangModule:
-            if module.type == .Library {
-                try module.generateModuleMap()
-            }
-            
-            let (compile, mkdir) = Command.compile(clangModule: module, externalModules: externalModules, configuration: conf, prefix: prefix)
+            let (compile, mkdir) = try Command.compile(clangModule: module, externalModules: externalModules, configuration: conf, prefix: prefix)
             commands.append(compile)
             commands.append(mkdir)
             targets.main.cmds.append(compile)

Sources/Build/misc.swift

@@ -30,8 +30,13 @@ func platformArgs() -> [String] {
 }
 
 extension CModule {
+    
+    var moduleMap: String {
+        return "module.modulemap"
+    }
+    
     var moduleMapPath: String {
-        return Path.join(path, "module.modulemap")
+        return Path.join(path, moduleMap)
     }
 }
 
@@ -41,7 +46,7 @@ extension ClangModule {
         case UnsupportedIncludeLayoutForModule(String)
     }
 
-    public func generateModuleMap() throws {
+    public func generateModuleMap(inDir wd: String) throws {
 
         //Return if module map is already present
         guard !moduleMapPath.isFile else {
@@ -50,13 +55,9 @@ extension ClangModule {
 
         let includeDir = path
 
-        //Generate empty module map if include dir is not present
+        //Warn and return if no include directory
         guard includeDir.isDirectory else {
-            print("warning: No include directory, generating empty module map")
-            try POSIX.mkdir(includeDir)
-            try fopen(moduleMapPath, mode: .Write) { fp in
-                try fputs("\n", fp)
-            }
+            print("warning: No include directory found, a library can not be imported without any public headers.")
             return
         }
 
@@ -67,7 +68,7 @@ extension ClangModule {
 
         if dirs.isEmpty {
             guard !files.isEmpty else { throw ModuleMapError.UnsupportedIncludeLayoutForModule(name) }
-            try createModuleMap(.FlatHeaderLayout)
+            try createModuleMap(inDir: wd, type: .FlatHeaderLayout)
             return
         }
 
@@ -77,9 +78,9 @@ extension ClangModule {
 
         let umbrellaHeader = Path.join(moduleHeaderDir, "\(name).h")
         if umbrellaHeader.isFile {
-            try createModuleMap(.HeaderFile)
+            try createModuleMap(inDir: wd, type: .HeaderFile)
         } else {
-            try createModuleMap(.ModuleNameDir)
+            try createModuleMap(inDir: wd, type: .ModuleNameDir)
         }
     }
 
@@ -89,20 +90,24 @@ extension ClangModule {
         case HeaderFile
     }
 
-    private func createModuleMap(type: UmbrellaType) throws {
-        let moduleMap = try fopen(moduleMapPath, mode: .Write)
+    private func createModuleMap(inDir wd: String, type: UmbrellaType) throws {
+        try POSIX.mkdir(wd)
+        let moduleMapFile = Path.join(wd, self.moduleMap)
+        let moduleMap = try fopen(moduleMapFile, mode: .Write)
         defer { fclose(moduleMap) }
 
         try fputs("module \(name) {\n", moduleMap)
         try fputs("    umbrella ", moduleMap)
 
         switch type {
         case .FlatHeaderLayout:
-            try fputs("\".\"\n", moduleMap)
+            try fputs("\"\(path)\"\n", moduleMap)
         case .ModuleNameDir:
-            try fputs("\"\(name)\"\n", moduleMap)
+            let path = Path.join(self.path, name)
+            try fputs("\"\(path)\"\n", moduleMap)
         case .HeaderFile:
-            try fputs("header \"\(name)/\(name).h\"\n", moduleMap)
+            let path = Path.join(self.path, name, "\(name).h")
+            try fputs("header \"\(path)\"\n", moduleMap)
 
         }