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

config variants

Browse Source
This commit is contained in:
Yonas Kolb
2017-07-26 12:54:37 +02:00
parent bb300ca1f3
commit 9cbd08e960
2 changed files with 25 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Sources/XcodeGenKit/PBXProjGenerator.swift
+19 -5
View File
@@ -29,6 +29,7 @@ public class PBXProjGenerator {
var topLevelGroups: [PBXGroup] = []
var carthageFrameworksByPlatform: [String: [String]] = [:]
var frameworkFiles: [String] = []
let generatedConfigs: [Config]
var ids = 0
var projectReference: String
@@ -36,6 +37,18 @@ public class PBXProjGenerator {
public init(spec: Spec, path: Path) {
self.spec = spec
self.basePath = path
if spec.configVariants.isEmpty {
generatedConfigs = spec.configs
} else {
generatedConfigs = spec.configs.reduce([]) { all, config in
all + spec.configVariants.map { variant in
let name = "\(variant) \(config.name)"
return Config(name: name, type: config.type, buildSettingGroups: config.buildSettingGroups, buildSettings: config.buildSettings)
}
}
}
projectReference = ""
projectReference = id()
}
@@ -47,7 +60,8 @@ public class PBXProjGenerator {
}
public func generate() throws -> PBXProj {
let buildConfigs: [XCBuildConfiguration] = try spec.configs.map { config in
let buildConfigs: [XCBuildConfiguration] = try generatedConfigs.map { config in
var buildSettings = config.buildSettings
if let type = config.type, let typeBuildSettings = try BuildSettingsPreset.config(type).getBuildSettings() {
buildSettings = typeBuildSettings.merged(buildSettings)
@@ -132,8 +146,8 @@ public class PBXProjGenerator {
sourceFilePaths += sourceGroups.filePaths
}
let configs: [XCBuildConfiguration] = try spec.configs.map { config in
let buildSettings = try getTargetBuildSettings(config: config, target: target)
let configs: [XCBuildConfiguration] = try generatedConfigs.map { config in
let buildSettings = try getTargetBuildSettings(config: config.name, target: target)
var baseConfigurationReference: String?
if let configPath = target.configs[config.name] {
let path = basePath + configPath
@@ -284,7 +298,7 @@ public class PBXProjGenerator {
return nil
}
func getTargetBuildSettings(config: Config, target: Target) throws -> BuildSettings {
func getTargetBuildSettings(config: String, target: Target) throws -> BuildSettings {
var buildSettings = BuildSettings()
func getBuildSettingPreset(_ type: BuildSettingsPreset) throws -> BuildSettings? {
@@ -295,7 +309,7 @@ public class PBXProjGenerator {
buildSettings += try getBuildSettingPreset(.platform(target.platform))
buildSettings += try getBuildSettingPreset(.product(target.type))
buildSettings += target.buildSettings?.buildSettings
buildSettings += target.buildSettings?.configSettings[config.name]
buildSettings += target.buildSettings?.configSettings[config]
return buildSettings
}
Sources/XcodeGenKit/Spec/Spec.swift
+6 -2
View File
@@ -19,11 +19,14 @@ public struct Spec {
public var settingGroups: [BuildSettingGroup]
public var configs: [Config]
public var schemes: [Scheme]
public init(name: String, targets: [Target] = [], configs: [Config] = [], settingGroups: [BuildSettingGroup] = [], schemes: [Scheme] = []) {
public var configVariants: [String]
public init(path: Path, name: String, targets: [Target] = [], configs: [Config] = [], configVariants: [String] = [], settingGroups: [BuildSettingGroup] = [], schemes: [Scheme] = []) {
self.path = path
self.name = name
self.targets = targets
self.configs = configs
self.configVariants = configVariants
self.settingGroups = settingGroups
self.schemes = schemes
}
@@ -53,5 +56,6 @@ extension Spec {
targets = try jsonDictionary.json(atKeyPath: "targets", invalidItemBehaviour: .fail)
}
schemes = try jsonDictionary.json(atKeyPath: "schemes")
configVariants = jsonDictionary.json(atKeyPath: "configVariants") ?? []
}
}