Implement buildXcodeprojPath

Author: giginet

Sources/Commands/SwiftPackageTool.swift

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

Sources/Xcodeproj/generate().swift

@@ -38,14 +38,21 @@ public struct XcodeprojOptions {
     }
 }
 
+public func buildXcodeprojPath(outputDir: AbsolutePath, projectName: String) -> AbsolutePath {
+    // Determine the path of the .xcodeproj wrapper directory.
+    let xcodeprojName = "\(projectName).xcodeproj"
+    return outputDir.appending(RelativePath(xcodeprojName))
+}
+
 /// Generates an Xcode project and all needed support files.  The .xcodeproj
 /// wrapper directory is created in the path specified by `outputDir`, basing
 /// the file name on the project name `projectName`.  Returns the path of the
 /// generated project.  All ancillary files will be generated inside of the
 /// .xcodeproj wrapper directory.
+@discardableResult
 public func generate(
-    outputDir: AbsolutePath,
     projectName: String,
+    xcodeprojPath: AbsolutePath,
     graph: PackageGraph,
     options: XcodeprojOptions
 ) throws -> (Xcode.Project, AbsolutePath) {
@@ -54,10 +61,6 @@ public func generate(
 
     let srcroot = graph.rootPackages[0].path
 
-    // Determine the path of the .xcodeproj wrapper directory.
-    let xcodeprojName = "\(projectName).xcodeproj"
-    let xcodeprojPath = outputDir.appending(RelativePath(xcodeprojName))
-
     // Determine the path of the scheme directory (it's inside the .xcodeproj).
     let schemesDir = xcodeprojPath.appending(components: "xcshareddata", "xcschemes")
 

Tests/XcodeprojTests/GenerateXcodeprojTests.swift

@@ -18,6 +18,14 @@ import Utility
 import XCTest
 
 class GenerateXcodeprojTests: XCTestCase {
+    func testBuildXcodeprojPath() {
+        let outdir = AbsolutePath("/path/to/project")
+        let projectName = "Bar"
+        let xcodeprojPath = Xcodeproj.buildXcodeprojPath(outputDir: outdir, projectName: projectName)
+        let expectedPath = AbsolutePath("/path/to/project/Bar.xcodeproj")
+        XCTAssertEqual(xcodeprojPath, expectedPath)
+    }
+    
     func testXcodebuildCanParseIt() {
       #if os(macOS)
         mktmpdir { dstdir in
@@ -28,7 +36,8 @@ class GenerateXcodeprojTests: XCTestCase {
             XCTAssertFalse(diagnostics.hasErrors)
 
             let projectName = "DummyProjectName"
-            let (_, outpath) = try Xcodeproj.generate(outputDir: dstdir, projectName: projectName, graph: graph, options: XcodeprojOptions())
+            let outpath = Xcodeproj.buildXcodeprojPath(outputDir: dstdir, projectName: projectName)
+            try Xcodeproj.generate(projectName: projectName, xcodeprojPath: outpath, graph: graph, options: XcodeprojOptions())
 
             XCTAssertDirectoryExists(outpath)
             XCTAssertEqual(outpath, dstdir.appending(component: projectName + ".xcodeproj"))