Returns Xcode.Project from generate()

Author: giginet

Sources/Commands/SwiftPackageTool.swift

@@ -162,13 +162,13 @@ public class SwiftPackageTool: SwiftTool<PackageToolOptions> {
                 dstdir = try getPackageRoot()
                 projectName = graph.rootPackages[0].name
             }
-            let outpath = try Xcodeproj.generate(
+            let project = try Xcodeproj.generate(
                 outputDir: dstdir,
                 projectName: projectName,
                 graph: graph,
                 options: options.xcodeprojOptions)
 
-            print("generated:", outpath.prettyPath(cwd: originalWorkingDirectory))
+            print("generated:", project.path.prettyPath(cwd: originalWorkingDirectory))
 
         case .describe:
             let graph = try loadPackageGraph()

Sources/Xcodeproj/XcodeProjectModel.swift

@@ -53,6 +53,7 @@
    main group; it needs to be added last in order to appear after the other
    references
 */
+import Basic
 
 public struct Xcode {
 
@@ -65,7 +66,10 @@ public struct Xcode {
         var productGroup: Group?
         var projectDir: String
         var targets: [Target]
-        init() {
+        public let path: AbsolutePath
+        
+        init(path: AbsolutePath) {
+            self.path = path
             self.mainGroup = Group(path: "")
             self.buildSettings = BuildSettingsTable()
             self.productGroup = nil

Sources/Xcodeproj/generate().swift

@@ -48,7 +48,7 @@ public func generate(
     projectName: String,
     graph: PackageGraph,
     options: XcodeprojOptions
-) throws -> AbsolutePath {
+) throws -> Xcode.Project {
     // Note that the output directory might be completely separate from the
     // path of the root package (which is where the sources live).
 
@@ -70,10 +70,15 @@ public func generate(
     let extraDirs = try findDirectoryReferences(path: srcroot)
 
     /// Generate the contents of project.xcodeproj (inside the .xcodeproj).
+    var project: Xcode.Project!
     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)
+        project = try pbxproj(xcodeprojPath: xcodeprojPath, graph: graph, extraDirs: extraDirs, options: options)
+        
+        // Serialize the project model we created to a plist, and return
+        // its string description.
+        let str = "// !$*UTF8*$!\n" + project.generatePlist().description
         stream(str)
     }
 
@@ -144,7 +149,7 @@ public func generate(
         }
     }
 
-    return xcodeprojPath
+    return project
 }
 
 /// Writes the contents to the file specified.

Sources/Xcodeproj/pbxproj().swift

@@ -62,7 +62,7 @@ func xcodeProject(
     ) throws -> Xcode.Project {
 
     // Create the project.
-    let project = Xcode.Project()
+    let project = Xcode.Project(path: xcodeprojPath)
 
     // Generates a dummy target to provide autocompletion for the manifest file.
     func createPackageDescriptionTarget(for package: ResolvedPackage, manifestFileRef: Xcode.FileReference) {