Merge pull request #701 from abertelrud/SR-2718

abertelrud · web-flow · commit 4b4ed741c25a · 2016-09-28T08:32:34.000-07:00
SR-2718: Xcode generated projects in custom locations have incorrect path to project in scheme file
diff --git a/Sources/Xcodeproj/generate().swift b/Sources/Xcodeproj/generate().swift
@@ -73,7 +73,7 @@ public func generate(outputDir: AbsolutePath, projectName: String, graph: Packag
    /// it has all tests associated so CMD+U works
     let schemeName = "\(projectName).xcscheme"
     try open(schemesDir.appending(RelativePath(schemeName))) { stream in
-        xcscheme(container: xcodeprojName, graph: graph, enableCodeCoverage: options.enableCodeCoverage, printer: stream)
+        xcscheme(container: xcodeprojPath.relative(to: srcroot).asString, graph: graph, enableCodeCoverage: options.enableCodeCoverage, printer: stream)
     }
 
 ////// we generate this file to ensure our main scheme is listed

Original file line number	Diff line number	Diff line change
`@@ -73,7 +73,7 @@ public func generate(outputDir: AbsolutePath, projectName: String, graph: Packag`
`73`	`73`	`/// it has all tests associated so CMD+U works`
`74`	`74`	`let schemeName = "\(projectName).xcscheme"`
`75`	`75`	`try open(schemesDir.appending(RelativePath(schemeName))) { stream in`
`76`		`- xcscheme(container: xcodeprojName, graph: graph, enableCodeCoverage: options.enableCodeCoverage, printer: stream)`
	`76`	`+ xcscheme(container: xcodeprojPath.relative(to: srcroot).asString, graph: graph, enableCodeCoverage: options.enableCodeCoverage, printer: stream)`
`77`	`77`	`}`
`78`	`78`
`79`	`79`	`////// we generate this file to ensure our main scheme is listed`