Merge pull request #149 from aciidb0mb3r/patch-9

Add support for empty source packages

Author: mxcl

Fixtures/InvalidLayouts/NoTargets/Package.swift

@@ -0,0 +1,7 @@
+import PackageDescription
+
+let package = Package(
+    name: "EmptyWithDependency",
+    dependencies: [
+		.Package(url: "../FooLib2", majorVersion: 1),
+	])

Fixtures/Miscellaneous/ExactDependencies/EmptyWithDependency/Package.swift

@@ -10,14 +10,25 @@
 
 import PackageType
 import Utility
+import func libc.exit
 
-public func transmute(packages: [Package]) throws -> ([Module], [Product]) {
+public func transmute(packages: [Package], rootdir: String) throws -> ([Module], [Product]) {
 
     var products: [Product] = []
     var map: [Package: [Module]] = [:]
 
     for package in packages {
-        let modules = try package.modules()
+
+        let modules: [Module]
+        do {
+            modules = try package.modules()
+        } catch Package.ModuleError.NoModules(let pkg) where pkg.path == rootdir {
+            //Ignore and print warning if root package doesn't contain any sources
+            print("warning: root package '\(pkg)' does not contain any sources")
+            if packages.count == 1 { exit(0) } //Exit now if there is no more packages 
+            modules = []
+        }
+
         let testModules = try package.testModules()
         products += try package.products(modules, tests: testModules)
 

Sources/Transmute/transmute().swift

@@ -44,7 +44,7 @@ do {
         case .Build(let conf):
             let dirs = try directories()
             let packages = try fetch(dirs.root)
-            let (modules, products) = try transmute(packages)
+            let (modules, products) = try transmute(packages, rootdir: dirs.root)
             let yaml = try describe(dirs.build, conf, modules, products, Xcc: opts.Xcc, Xld: opts.Xld, Xswiftc: opts.Xswiftc)
             try build(YAMLPath: yaml, target: "default")
 

Sources/swift-build/main.swift

@@ -14,13 +14,6 @@ import func POSIX.unlink
 
 class InvalidLayoutsTestCase: XCTestCase {
 
-    func testNoTargets() {
-        fixture(name: "InvalidLayouts/NoTargets") { prefix in
-            XCTAssertFileExists(prefix, "Package.swift")
-            XCTAssertBuildFails(prefix)
-        }
-    }
-
     func testMultipleRoots() {
         fixture(name: "InvalidLayouts/MultipleRoots1") { prefix in
             XCTAssertBuildFails(prefix)

Tests/Functional/TestInvalidLayouts.swift

@@ -31,6 +31,25 @@ class MiscellaneousTestCase: XCTestCase {
         }
     }
 
+    func testPackageWithNoSources() {
+
+        // Tests a package with no source files
+
+        fixture(name: "Miscellaneous/Empty") { prefix in
+            XCTAssertBuilds(prefix)
+        }
+    }
+
+    func testPackageWithNoSourcesButDependency() {
+
+        // Tests a package with no source files but dependency, dependency should build.
+
+        fixture(name: "Miscellaneous/ExactDependencies") { prefix in
+            XCTAssertBuilds(prefix, "EmptyWithDependency")
+            XCTAssertFileExists(prefix, "EmptyWithDependency/.build/debug/FooLib2.swiftmodule")
+        }
+    }
+
     func testManifestExcludes1() {
 
         // Tests exclude syntax where no target customization is specified

Tests/Functional/TestMiscellaneous.swift

@@ -145,7 +145,6 @@ extension DependencyResolutionTestCase {
 extension InvalidLayoutsTestCase {
     static var allTests : [(String, InvalidLayoutsTestCase -> () throws -> Void)] {
         return [
-            ("testNoTargets", testNoTargets),
             ("testMultipleRoots", testMultipleRoots),
             ("testInvalidLayout1", testInvalidLayout1),
             ("testInvalidLayout2", testInvalidLayout2),
@@ -160,6 +159,8 @@ extension MiscellaneousTestCase {
     static var allTests : [(String, MiscellaneousTestCase -> () throws -> Void)] {
         return [
             ("testPrintsSelectedDependencyVersion", testPrintsSelectedDependencyVersion),
+            ("testPackageWithNoSources", testPackageWithNoSources),
+            ("testPackageWithNoSourcesButDependency", testPackageWithNoSourcesButDependency),
             ("testManifestExcludes1", testManifestExcludes1),
             ("testManifestExcludes2", testManifestExcludes2),
             ("testManifestExcludes3", testManifestExcludes3),

Tests/Functional/TestValidLayouts.swift

@@ -201,7 +201,7 @@ extension ModuleTests {
             let prefix = Path.join(prefix, "App")
             let manifest = try Manifest(path: prefix, baseURL: prefix)
             let packages = try get(manifest)
-            let (modules, _) = try transmute(packages)
+            let (modules, _) = try transmute(packages, rootdir: prefix)
 
             XCTAssertEqual(modules.count, 3)
             XCTAssertEqual(recursiveDependencies(modules).count, 3)
@@ -212,7 +212,7 @@ extension ModuleTests {
             let prefix = Path.join(prefix, "App")
             let manifest = try Manifest(path: prefix, baseURL: prefix)
             let packages = try get(manifest)
-            let (modules, _) = try transmute(packages)
+            let (modules, _) = try transmute(packages, rootdir: prefix)
 
             XCTAssertEqual(modules.count, 2)
             XCTAssertTrue(modules.first is CModule)