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

Avoid overwriting xcconfig value by presets value

Browse Source
This commit is contained in:
toshi0383
2017-10-04 22:21:57 +09:00
parent 388bc9280c
commit 4c838a3eec
1 changed files with 26 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Sources/XcodeGenKit/PBXProjGenerator.swift
+26 -1
View File
@@ -70,10 +70,17 @@ public class PBXProjGenerator {
}
let buildConfigs: [XCBuildConfiguration] = spec.configs.map { config in
let buildSettings = spec.getProjectBuildSettings(config: config)
var buildSettings = spec.getProjectBuildSettings(config: config)
var baseConfigurationReference: String?
if let configPath = spec.configFiles[config.name] {
baseConfigurationReference = getFileReference(path: basePath + configPath, inPath: basePath)
// Do not overwrite xcconfig's value.
if let configFile = try? XCConfig(path: basePath + configPath) {
for (k, _) in configFile.flattenedBuildSettings() {
// FIXME: Catch platform specifier. e.g. LD_RUNPATH_SEARCH_PATHS[sdk=iphone*]
buildSettings.removeValue(forKey: k)
}
}
}
return XCBuildConfiguration(reference: generateUUID(XCBuildConfiguration.self, config.name), name: config.name, baseConfigurationReference: baseConfigurationReference, buildSettings: buildSettings)
}
@@ -173,6 +180,24 @@ public class PBXProjGenerator {
let configs: [XCBuildConfiguration] = spec.configs.map { config in
var buildSettings = spec.getTargetBuildSettings(target: target, config: config)
// Do not overwrite target's xcconfig values.
if let configPath = spec.targets.flatMap({ $0 == target ? $0.configFiles[config.name] : nil }).first {
if let configFile = try? XCConfig(path: basePath + configPath) {
for (k, _) in configFile.flattenedBuildSettings() {
// FIXME: Catch platform specifier. e.g. LD_RUNPATH_SEARCH_PATHS[sdk=iphone*]
buildSettings.removeValue(forKey: k)
}
}
}
// Do not overwrite base xcconfig values.
if let configPath = spec.configFiles[config.name] {
if let configFile = try? XCConfig(path: basePath + configPath) {
for (k, _) in configFile.flattenedBuildSettings() {
// FIXME: Catch platform specifier. e.g. LD_RUNPATH_SEARCH_PATHS[sdk=iphone*]
buildSettings.removeValue(forKey: k)
}
}
}
// automatically set INFOPLIST_FILE path
if let plistPath = infoPlists.first,