Add Objective-C Support to ClangModules

Fixtures/ClangModules/Objc/.gitignore

@@ -0,0 +1,4 @@
+.DS_Store
+/.build
+/Packages
+/*.xcodeproj

Fixtures/ClangModules/Objc/Package.swift

@@ -0,0 +1,7 @@
+import PackageDescription
+
+let package = Package(
+    name: "Objc",
+    targets: [Target(name: "objc-exec", dependencies:["objc"]),
+              Target(name: "swift-exec", dependencies:["objc"])]
+)

Fixtures/ClangModules/Objc/Sources/objc-exec/main.m

@@ -0,0 +1,8 @@
+#import <Foundation/Foundation.h>
+#import "objc.h"
+
+int main() {
+    int result = [[[Foo alloc] init] foo] + one();
+    printf("Hello from Objc %d", result);
+    return 0;
+}

Fixtures/ClangModules/Objc/Sources/objc/include/objc.h

@@ -0,0 +1,8 @@
+#import <Foundation/Foundation.h>
+#include "sea.h"
+
+@interface Foo: NSObject
+
+- (int)foo;
+
+@end

Fixtures/ClangModules/Objc/Sources/objc/include/sea.h

@@ -0,0 +1 @@
+int one();

Fixtures/ClangModules/Objc/Sources/objc/objc.m

@@ -0,0 +1,9 @@
+#import "include/objc.h"
+
+@implementation Foo
+
+- (int)foo {
+    return 3 + one();
+}
+
+@end

Fixtures/ClangModules/Objc/Sources/objc/sea.c

@@ -0,0 +1,4 @@
+#include "include/sea.h"
+int one() {
+    return 1;
+}

Fixtures/ClangModules/Objc/Sources/swift-exec/main.swift

@@ -0,0 +1,3 @@
+import objc
+
+print("\(Foo().foo() + one())")

Sources/PackageModel/Module.swift

@@ -51,13 +51,13 @@ public enum ModuleType {
 public protocol ModuleTypeProtocol {
     var sources: Sources { get }
     var type: ModuleType { get }
-    var mainFile: String { get }
+    var mainFiles: Set<String> { get }
 }
 
 extension ModuleTypeProtocol {
     public var type: ModuleType {
         let isLibrary = !sources.relativePaths.contains { path in
-            path.basename.lowercased() == mainFile
+            mainFiles.contains(path.basename.lowercased())
         }
         return isLibrary ? .Library : .Executable
     }
@@ -86,8 +86,8 @@ public class SwiftModule: Module {
 }
 
 extension SwiftModule: ModuleTypeProtocol {
-    public var mainFile: String {
-        return "main.swift"
+    public var mainFiles: Set<String> {
+        return ["main.swift"]
     }
 }
 
@@ -125,8 +125,8 @@ extension ClangModule: XcodeModuleProtocol {
 }
 
 extension ClangModule: ModuleTypeProtocol {
-    public var mainFile: String {
-        return "main.c"
+    public var mainFiles: Set<String> {
+        return ["main.c", "main.m"]
     }
 }
 

Sources/PackageModel/Sources.swift

@@ -29,7 +29,7 @@ public struct Sources {
 
     static public var validSwiftExtensions = Set<String>(["swift"])
 
-    static public var validCExtensions = Set<String>(["c"])
+    static public var validCExtensions = Set<String>(["c", "m"])
 
     static public var validExtensions = { validSwiftExtensions.union(validCExtensions) }()
 }

Tests/Functional/ClangModuleTests.swift

@@ -100,6 +100,29 @@ class ClangModulesTestCase: XCTestCase {
             XCTAssertFileExists(prefix, ".build", "debug", "libCDynamicLookup.so")
         }
     }
+
+    #if os(OSX)
+    func testObjectiveCModule() {
+        fixture(name: "ClangModules/Objc") { prefix in
+            XCTAssertBuilds(prefix)
+
+            // Check if objc module is present.
+            XCTAssertFileExists(prefix, ".build", "debug", "libobjc.so")
+
+            // Test objc executable (depends on objc module).
+            let objcExec = ".build/debug/objc_exec"
+            XCTAssertFileExists(prefix, objcExec)
+            var output = try popen([Path.join(prefix, objcExec)])
+            XCTAssertEqual(output, "Hello from Objc 5")
+
+            // Test swift executable (depends on objc module).
+            let swiftExec = ".build/debug/swift-exec"
+            XCTAssertFileExists(prefix, swiftExec)
+            output = try popen([Path.join(prefix, swiftExec)])
+            XCTAssertEqual(output, "5\n")
+        }
+    }
+    #endif
 }