change base class for ClangModule

Author: aciidgh

Sources/Build/describe().swift

@@ -115,7 +115,7 @@ public func describe(prefix: String, _ conf: Configuration, _ modules: [Module],
 
         var args: [String] = []
         args += ["-fmodules", "-fmodule-name=\(module.name)"]
-        args += ["-fmodule-map-file=\(module.moduleMapPath)", "-working-directory", Path.join(prefix, "\(module.c99name).build")]
+        args += ["-fmodule-map-file=\(module.path)", "-working-directory", Path.join(prefix, "\(module.c99name).build")]
 
         switch conf {
         case .Debug:

Sources/Build/misc.swift

@@ -33,7 +33,7 @@ extension Module {
                 let moduleMapPath = Path.join(module.path, "module.modulemap")
                 return ["-Xcc", "-fmodule-map-file=\(moduleMapPath)"]
             } else if let cmodule = module as? ClangModule {
-                return ["-Xcc", "-fmodule-map-file=\(cmodule.moduleMapPath)"]
+                return ["-Xcc", "-fmodule-map-file=\(cmodule.path)"]
             } else {
                 return []
             }

Sources/PackageType/Module.swift

@@ -70,15 +70,13 @@ public class CModule: Module {
     }
 }
 
-public class ClangModule: Module {
+public class ClangModule: CModule {
     public let sources: Sources
-    public let moduleMapPath: String
 
     public init(name: String, sources: Sources) {
         self.sources = sources
         //TODO: generate this with swiftpm if layout supports
-        moduleMapPath = sources.root + "/include/module.modulemap"
-        super.init(name: name)
+        super.init(name: name, path: sources.root + "/include/module.modulemap")
     }
 }
 

Sources/Transmute/Package+shouldConsiderDirectory.swift

@@ -15,7 +15,7 @@ extension Package {
     func shouldConsiderDirectory(path: String) -> Bool {
         let base = path.basename.lowercaseString
         if base == "tests" { return false }
-        if base.hasSuffix("include") { return false }
+        if base == "include" { return false }
         if base.hasSuffix(".xcodeproj") { return false }
         if base.hasSuffix(".playground") { return false }
         if base.hasPrefix(".") { return false }  // eg .git