Add non-source files from source directories

Author: ViktorSimko

Sources/Xcodeproj/generate().swift

@@ -69,11 +69,16 @@ public func generate(
     // references in the project.
     let extraDirs = try findDirectoryReferences(path: srcroot)
 
+    // Find non-source files in the source directories that should be added
+    // as a reference to the project.
+    var extraFiles = try findNonSourceFiles(path: srcroot.appending(component: "Sources"))
+    extraFiles.append(contentsOf: try findNonSourceFiles(path: srcroot.appending(component: "Tests")))
+
     /// Generate the contents of project.xcodeproj (inside the .xcodeproj).
     try open(xcodeprojPath.appending(component: "project.pbxproj")) { stream in
         // FIXME: This could be more efficient by directly writing to a stream
         // instead of first creating a string.
-        let str = try pbxproj(xcodeprojPath: xcodeprojPath, graph: graph, extraDirs: extraDirs, options: options)
+        let str = try pbxproj(xcodeprojPath: xcodeprojPath, graph: graph, extraDirs: extraDirs, extraFiles: extraFiles, options: options)
         stream(str)
     }
 
@@ -181,3 +186,17 @@ func findDirectoryReferences(path: AbsolutePath) throws -> [AbsolutePath] {
         return isDirectory($0)
     })
 }
+
+/// Finds the non-source files from `path` recursively
+func findNonSourceFiles(path: AbsolutePath) throws -> [AbsolutePath] {
+    let filesFromPath = try walk(path, recursively: true)
+
+    return filesFromPath.filter {
+        if !isFile($0) { return false }
+        if let `extension` = $0.extension {
+            if SupportedLanguageExtension.cFamilyExtensions.contains(`extension`) { return false }
+            if SupportedLanguageExtension.swiftExtensions.contains(`extension`) { return false }
+        }
+        return true
+    }
+}

Sources/Xcodeproj/pbxproj().swift

@@ -32,13 +32,15 @@ public func pbxproj(
         xcodeprojPath: AbsolutePath,
         graph: PackageGraph,
         extraDirs: [AbsolutePath],
+        extraFiles: [AbsolutePath],
         options: XcodeprojOptions,
         fileSystem: FileSystem = localFileSystem
     ) throws -> String {
     let project = try xcodeProject(
         xcodeprojPath: xcodeprojPath,
         graph: graph,
         extraDirs: extraDirs,
+        extraFiles: extraFiles,
         options: options,
         fileSystem: fileSystem)
     // Serialize the project model we created to a plist, and return
@@ -56,6 +58,7 @@ func xcodeProject(
     xcodeprojPath: AbsolutePath,
     graph: PackageGraph,
     extraDirs: [AbsolutePath],
+    extraFiles: [AbsolutePath],
     options: XcodeprojOptions,
     fileSystem: FileSystem,
     warningStream: OutputByteStream = stdoutStream
@@ -294,7 +297,6 @@ func xcodeProject(
             let name = (sourcesGroup == nil ? groupName : target.name)
             let group = (sourcesGroup ?? parentGroup)
                 .addGroup(path: (path == "." ? "" : path), pathBase: .projectDir, name: name)
-
             // Associate the group with the target's root path.
             srcPathsToGroups[target.sources.root] = group
         }
@@ -320,6 +322,11 @@ func xcodeProject(
         project.mainGroup.addFileReference(path: extraDir.relative(to: sourceRootDir).asString, pathBase: .projectDir)
     }
 
+    for extraFile in extraFiles {
+        let groupOfFile = srcPathsToGroups[extraFile.parentDirectory]
+        groupOfFile?.addFileReference(path: extraFile.basename)
+    }
+
     // Determine the set of targets to generate in the project by excluding
     // any system targets.
     let targets = graph.reachableTargets.filter({ $0.type != .systemModule })