GitHub/XcodeGen
1
0
Fork 0
mirror of https://github.com/yonaskolb/XcodeGen.git synced 2026-03-18 20:02:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Support external project file for build target

Browse Source
This commit is contained in:
Yuta Saito
2019-09-14 18:15:43 +09:00
parent c4d63e569a
commit 67b3256a1b
2 changed files with 23 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Sources/ProjectSpec/Scheme.swift
+8 -1
View File
@@ -112,6 +112,7 @@ public struct Scheme: Equatable {
public static let parallelizableDefault = false
public let name: String
public var externalProject: String?
public var randomExecutionOrder: Bool
public var parallelizable: Bool
public var skippedTests: [String]
@@ -220,11 +221,13 @@ public struct Scheme: Equatable {
public struct BuildTarget: Equatable {
public var target: String
public var externalProject: String?
public var buildTypes: [BuildType]
public init(target: String, buildTypes: [BuildType] = BuildType.all) {
public init(target: String, externalProject: String? = nil, buildTypes: [BuildType] = BuildType.all) {
self.target = target
self.buildTypes = buildTypes
self.externalProject = externalProject
}
}
}
@@ -335,6 +338,7 @@ extension Scheme.Test.TestTarget: JSONObjectConvertible {
public init(jsonDictionary: JSONDictionary) throws {
name = try jsonDictionary.json(atKeyPath: "name")
externalProject = jsonDictionary.json(atKeyPath: "externalProject")
randomExecutionOrder = jsonDictionary.json(atKeyPath: "randomExecutionOrder") ?? Scheme.Test.TestTarget.randomExecutionOrderDefault
parallelizable = jsonDictionary.json(atKeyPath: "parallelizable") ?? Scheme.Test.TestTarget.parallelizableDefault
skippedTests = jsonDictionary.json(atKeyPath: "skippedTests") ?? []
@@ -357,6 +361,9 @@ extension Scheme.Test.TestTarget: JSONEncodable {
if parallelizable != Scheme.Test.TestTarget.parallelizableDefault {
dict["parallelizable"] = parallelizable
}
if let externalProject = externalProject {
dict["externalProject"] = externalProject
}
return dict
}
Sources/XcodeGenKit/SchemeGenerator.swift
+15 -10
View File
@@ -75,18 +75,24 @@ public class SchemeGenerator {
public func generateScheme(_ scheme: Scheme) throws -> XCScheme {
func getBuildEntry(
_ buildTarget: Scheme.BuildTarget,
from project: (pbxProj: PBXProj, name: String)
) -> XCScheme.BuildAction.Entry {
func getBuildEntry(_ buildTarget: Scheme.BuildTarget) throws -> XCScheme.BuildAction.Entry {
let pbxProj: PBXProj
let projectFilename: String
if let externalProject = buildTarget.externalProject {
pbxProj = try XcodeProj(pathString: externalProject).pbxproj
projectFilename = externalProject
} else {
pbxProj = self.pbxProj
projectFilename = "\(self.project.name).xcodeproj"
}
guard let pbxTarget = project.pbxProj.targets(named: buildTarget.target).first else {
guard let pbxTarget = pbxProj.targets(named: buildTarget.target).first else {
fatalError("Unable to find target named \"\(buildTarget.target)\" in \"PBXProj.targets\"")
}
let buildableName = pbxTarget.productNameWithExtension() ?? pbxTarget.name
let buildableReference = XCScheme.BuildableReference(
referencedContainer: "container:\(project.name).xcodeproj",
referencedContainer: "container:\(projectFilename)",
blueprint: pbxTarget,
buildableName: buildableName,
blueprintName: buildTarget.target
@@ -96,13 +102,12 @@ public class SchemeGenerator {
let testTargets = scheme.test?.targets ?? []
let testBuildTargets = testTargets.map {
Scheme.BuildTarget(target: $0.name, buildTypes: BuildType.testOnly)
Scheme.BuildTarget(target: $0.name, externalProject: $0.externalProject, buildTypes: BuildType.testOnly)
}
let testBuildTargetEntries = testBuildTargets.map { getBuildEntry($0, from: (pbxProj, project.name)) }
let testBuildTargetEntries = try testBuildTargets.map(getBuildEntry)
let buildActionEntries: [XCScheme.BuildAction.Entry] = scheme.build.targets
.map { getBuildEntry($0, from: (pbxProj, project.name)) }
let buildActionEntries: [XCScheme.BuildAction.Entry] = try scheme.build.targets.map(getBuildEntry)
func getExecutionAction(_ action: Scheme.ExecutionAction) -> XCScheme.ExecutionAction {
// ExecutionActions can require the use of build settings. Xcode allows the settings to come from a build or test target.