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

Remove basePath parameter for spec

Browse Source
This commit is contained in:
toshi0383
2017-10-29 08:27:42 +09:00
parent 28b6e2cfbf
commit f68f96e249
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Sources/XcodeGenKit/PBXProjGenerator.swift
+2 -2
View File
@@ -69,7 +69,7 @@ public class PBXProjGenerator {
}
let buildConfigs: [XCBuildConfiguration] = spec.configs.map { config in
let buildSettings = spec.getProjectBuildSettings(basePath: basePath, config: config)
let buildSettings = spec.getProjectBuildSettings(config: config)
var baseConfigurationReference: String?
if let configPath = spec.configFiles[config.name] {
baseConfigurationReference = getFileReference(path: spec.basePath + configPath, inPath: spec.basePath)
@@ -171,7 +171,7 @@ public class PBXProjGenerator {
}
let configs: [XCBuildConfiguration] = spec.configs.map { config in
var buildSettings = spec.getTargetBuildSettings(basePath: basePath, target: target, config: config)
var buildSettings = spec.getTargetBuildSettings(target: target, config: config)
// automatically set INFOPLIST_FILE path
if let plistPath = infoPlists.first,
Sources/XcodeGenKit/SettingsBuilder.swift
+4 -4
View File
@@ -15,7 +15,7 @@ import JSONUtilities
extension ProjectSpec {
public func getProjectBuildSettings(basePath: Path, config: Config) -> BuildSettings {
public func getProjectBuildSettings(config: Config) -> BuildSettings {
var buildSettings: BuildSettings = [:]
if let type = config.type, options.settingPresets.applyProject {
@@ -38,7 +38,7 @@ extension ProjectSpec {
return buildSettings
}
public func getTargetBuildSettings(basePath: Path, target: Target, config: Config) -> BuildSettings {
public func getTargetBuildSettings(target: Target, config: Config) -> BuildSettings {
var buildSettings = BuildSettings()
if options.settingPresets.applyTarget {
@@ -99,14 +99,14 @@ extension ProjectSpec {
buildSettings += configFile.flattenedBuildSettings()
}
}
buildSettings += getProjectBuildSettings(basePath: basePath, config: config)
buildSettings += getProjectBuildSettings(config: config)
}
if let configFilePath = target.configFiles[config.name] {
if let configFile = try? XCConfig(path: basePath + configFilePath) {
buildSettings += configFile.flattenedBuildSettings()
}
}
buildSettings += getTargetBuildSettings(basePath: basePath, target: target, config: config)
buildSettings += getTargetBuildSettings(target: target, config: config)
return buildSettings
}