[Xcodeproj] Push system-module filtering a little lower.

Author: ddunbar

Sources/Xcodeproj/generate().swift

@@ -37,10 +37,6 @@ public func generate(dstdir: AbsolutePath, projectName: String, graph: PackageGr
     let srcroot = graph.rootPackage.path
 
     // Filter out the CModule type, which we don't support.
-    //
-    // FIXME: Sink this lower.
-    let modules = graph.modules.filter{ $0.type != .systemModule }
-    let externalModules = graph.externalModules.filter{ $0.type != .systemModule }
 
     let xcodeprojName = "\(projectName).xcodeproj"
     let xcodeprojPath = dstdir.appending(RelativePath(xcodeprojName))
@@ -52,13 +48,13 @@ public func generate(dstdir: AbsolutePath, projectName: String, graph: PackageGr
 
 ////// the pbxproj file describes the project and its targets
     try open(xcodeprojPath.appending("project.pbxproj")) { stream in
-        try pbxproj(srcroot: srcroot, projectRoot: dstdir, xcodeprojPath: xcodeprojPath, modules: modules, externalModules: externalModules, products: graph.products, directoryReferences: directoryReferences, options: options, printer: stream)
+        try pbxproj(srcroot: srcroot, projectRoot: dstdir, xcodeprojPath: xcodeprojPath, graph: graph, directoryReferences: directoryReferences, options: options, printer: stream)
     }
 
 ////// the scheme acts like an aggregate target for all our targets
    /// it has all tests associated so CMD+U works
     try open(schemesDirectory.appending(RelativePath(schemeName))) { stream in
-        xcscheme(container: xcodeprojName, modules: modules, printer: stream)
+        xcscheme(container: xcodeprojName, graph: graph, printer: stream)
     }
 
 ////// we generate this file to ensure our main scheme is listed
@@ -78,7 +74,7 @@ public func generate(dstdir: AbsolutePath, projectName: String, graph: PackageGr
         print("</plist>")
     }
 
-    for module in modules where module.isLibrary {
+    for module in graph.modules where module.isLibrary {
         ///// For framework targets, generate module.c99Name_Info.plist files in the 
         ///// directory that Xcode project is generated
         let name = module.infoPlistFileName

Sources/Xcodeproj/pbxproj().swift

@@ -10,14 +10,19 @@
 
 import Basic
 import POSIX
+import PackageGraph
 import PackageModel
 import Utility
 
 
 // FIXME: escaping
 
 
-public func pbxproj(srcroot: AbsolutePath, projectRoot: AbsolutePath, xcodeprojPath: AbsolutePath, modules: [Module], externalModules: [Module], products _: [Product], directoryReferences: [AbsolutePath], options: XcodeprojOptions, printer print: (String) -> Void) throws {
+public func pbxproj(srcroot: AbsolutePath, projectRoot: AbsolutePath, xcodeprojPath: AbsolutePath, graph: PackageGraph, directoryReferences: [AbsolutePath], options: XcodeprojOptions, printer print: (String) -> Void) throws {
+    // FIXME: Push this lower.
+    let modules = graph.modules.filter{ $0.type != .systemModule }
+    let externalModules = graph.externalModules.filter{ $0.type != .systemModule }
+
     // let rootModulesSet = Set(modules).subtract(Set(externalModules))
     let rootModulesSet = modules
     let nonTestRootModules = rootModulesSet.filter{ !$0.isTest }

Sources/Xcodeproj/xcscheme().swift

@@ -8,16 +8,25 @@
  See http://swift.org/CONTRIBUTORS.txt for Swift project authors
 */
 
+import PackageGraph
 import PackageModel
 
-func xcscheme(container: String, modules: [Module], printer print: (String) -> Void) {
+func xcscheme(container: String, graph: PackageGraph, 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\">")
     print("    <BuildActionEntries>")
 
     // Create buildable references for non-test modules.
-    for module in modules where !module.isTest {
+    for module in graph.modules where !module.isTest {
+        // Ignore system modules.
+        //
+        // FIXME: We shouldn't need to manually do this here, instead this
+        // should be phrased in terms of the set of targets we computed.
+        if module.type == .systemModule {
+            continue
+        }
+        
         print("      <BuildActionEntry buildForTesting = \"YES\" buildForRunning = \"YES\" buildForProfiling = \"YES\" buildForArchiving = \"YES\" buildForAnalyzing = \"YES\">")
         print("        <BuildableReference")
         print("          BuildableIdentifier = \"primary\"")
@@ -40,7 +49,7 @@ func xcscheme(container: String, modules: [Module], printer print: (String) -> V
     print("    <Testables>")
 
     // Create testable references.
-    for module in modules where module.isTest {
+    for module in graph.modules where module.isTest {
         print("    <TestableReference")
         print("      skipped = \"NO\">")
         print("      <BuildableReference")