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

Update to 1.4.0

Browse Source
This commit is contained in:
Yonas Kolb
2017-11-16 11:49:30 +01:00
parent e259fed065
commit 0004cdd333
6 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Sources/XcodeGenKit/PBXProjGenerator.swift
+1 -1
View File
@@ -224,7 +224,7 @@ public class PBXProjGenerator {
var baseConfigurationReference: String?
if let configPath = target.configFiles[config.name] {
baseConfigurationReference = sourceGenerator.getContainedFileReference(path: spec.basePath + configPath)
baseConfigurationReference = sourceGenerator.getContainedFileReference(path: spec.basePath + configPath)
}
return XCBuildConfiguration(reference: referenceGenerator.generate(XCBuildConfiguration.self, config.name + target.name), name: config.name, baseConfigurationReference: baseConfigurationReference, buildSettings: buildSettings)
}
Sources/XcodeGenKit/SourceGenerator.swift
+2 -3
View File
@@ -62,7 +62,7 @@ class SourceGenerator {
settings["COMPILER_FLAGS"] = targetSource.compilerFlags.joined(separator: " ")
}
//TODO: add the target name to the reference generator string so shared files don't have same reference (that will be escaped by appending a number)
// TODO: add the target name to the reference generator string so shared files don't have same reference (that will be escaped by appending a number)
let buildFile = PBXBuildFile(reference: referenceGenerator.generate(PBXBuildFile.self, fileReference + targetName), fileRef: fileReference, settings: settings.isEmpty ? nil : settings)
return SourceFile(path: path, fileReference: fileReference, buildFile: buildFile, buildPhase: buildPhase)
}
@@ -91,7 +91,6 @@ class SourceGenerator {
}
}
private func getDefaultBuildPhase(for path: Path) -> BuildPhase? {
if path.lastComponent == "Info.plist" {
return nil
@@ -109,7 +108,7 @@ class SourceGenerator {
private func getGroup(path: Path, name: String? = nil, mergingChildren children: [String], createIntermediateGroups: Bool, isBaseGroup: Bool) -> PBXGroup {
let group: PBXGroup
if let cachedGroup = groupsByPath[path] {
// only add the children that aren't already in the cachedGroup
cachedGroup.children = Array(Set(cachedGroup.children + children))