Rename to projectDirectory

This commit is contained in:
giginet
2019-10-08 22:52:51 +09:00
parent b208921328
commit 7db2d2c526
4 changed files with 10 additions and 10 deletions
+2 -2
View File
@@ -24,13 +24,13 @@ public class PBXProjGenerator {
var generated = false
public init(project: Project, projectDestinationDirectory: Path?) {
public init(project: Project, projectDirectory: Path?) {
self.project = project
carthageResolver = CarthageDependencyResolver(project: project)
pbxProj = PBXProj(rootObject: nil, objectVersion: project.objectVersion)
sourceGenerator = SourceGenerator(project: project,
pbxProj: pbxProj,
projectDestinationDirectory: projectDestinationDirectory)
projectDirectory: projectDirectory)
}
@discardableResult
+2 -2
View File
@@ -13,11 +13,11 @@ public class ProjectGenerator {
self.project = project
}
public func generateXcodeProject(to projectDestinationDirectory: Path? = nil) throws -> XcodeProj {
public func generateXcodeProject(to projectDirectory: Path? = nil) throws -> XcodeProj {
// generate PBXProj
let pbxProjGenerator = PBXProjGenerator(project: project,
projectDestinationDirectory: projectDestinationDirectory)
projectDirectory: projectDirectory)
let pbxProj = try pbxProjGenerator.generate()
// generate Schemes
+4 -4
View File
@@ -13,7 +13,7 @@ struct SourceFile {
class SourceGenerator {
var rootGroups: Set<PBXFileElement> = []
private let projectDestinationDirectory: Path?
private let projectDirectory: Path?
private var fileReferencesByPath: [String: PBXFileElement] = [:]
private var groupsByPath: [Path: PBXGroup] = [:]
private var variantGroupsByPath: [Path: PBXVariantGroup] = [:]
@@ -31,10 +31,10 @@ class SourceGenerator {
private(set) var knownRegions: Set<String> = []
init(project: Project, pbxProj: PBXProj, projectDestinationDirectory: Path?) {
init(project: Project, pbxProj: PBXProj, projectDirectory: Path?) {
self.project = project
self.pbxProj = pbxProj
self.projectDestinationDirectory = projectDestinationDirectory
self.projectDirectory = projectDirectory
}
@discardableResult
@@ -289,7 +289,7 @@ class SourceGenerator {
let groupName = name ?? path.lastComponent
let groupPath: String
switch try? path.relativePath(from: projectDestinationDirectory ?? project.basePath).string {
switch try? path.relativePath(from: projectDirectory ?? project.basePath).string {
case .some(let relativePath) where isTopLevelGroup:
groupPath = relativePath
default: