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

Merge branch 'master' into disable_main_thread_checker

Browse Source
This commit is contained in:
Yonas Kolb
2019-09-01 02:53:28 +10:00
committed by GitHub
parent 30ef0fb3be aa82a911f1
commit 3a67d0e53c
13 changed files with 195 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Sources/XcodeGenKit/PBXProjGenerator.swift
+2 -10
View File
@@ -504,9 +504,6 @@ public class PBXProjGenerator {
let buildPath = Path(dependency.reference).parent().string.quoted
frameworkBuildPaths.insert(buildPath)
// Static libraries can't link or embed dynamic frameworks
guard target.type != .staticLibrary else { break }
let fileReference: PBXFileElement
if dependency.implicit {
fileReference = sourceGenerator.getFileReference(
@@ -521,7 +518,7 @@ public class PBXProjGenerator {
)
}
if dependency.link ?? true {
if dependency.link ?? (target.type != .staticLibrary) {
let buildFile = addObject(
PBXBuildFile(file: fileReference, settings: getDependencyFrameworkSettings(dependency: dependency))
)
@@ -540,8 +537,6 @@ public class PBXProjGenerator {
copyFrameworksReferences.append(embedFile)
}
case .sdk(let root):
// Static libraries can't link or embed dynamic frameworks
guard target.type != .staticLibrary else { break }
var dependencyPath = Path(dependency.reference)
if !dependency.reference.contains("/") {
@@ -589,8 +584,6 @@ public class PBXProjGenerator {
let allDependencies = findFrameworks
? carthageResolver.relatedDependencies(for: dependency, in: target.platform) : [dependency]
allDependencies.forEach { dependency in
// Static libraries can't link or embed dynamic frameworks
guard target.type != .staticLibrary else { return }
var platformPath = Path(carthageResolver.buildPath(for: target.platform))
var frameworkPath = platformPath + dependency.reference
@@ -601,7 +594,7 @@ public class PBXProjGenerator {
self.carthageFrameworksByPlatform[target.platform.carthageName, default: []].insert(fileReference)
if dependency.link ?? true {
if dependency.link ?? (target.type != .staticLibrary) {
let buildFile = self.addObject(
PBXBuildFile(file: fileReference, settings: getDependencyFrameworkSettings(dependency: dependency))
)
@@ -613,7 +606,6 @@ public class PBXProjGenerator {
}
for dependency in carthageDependencies {
guard target.type != .staticLibrary else { break }
let embed = dependency.embed ?? target.shouldEmbedCarthageDependencies
Sources/XcodeGenKit/SourceGenerator.swift
+4
View File
@@ -24,6 +24,9 @@ class SourceGenerator {
var defaultExcludedFiles = [
".DS_Store",
]
private let defaultExcludedExtensions = [
"orig",
]
private(set) var knownRegions: Set<String> = []
@@ -317,6 +320,7 @@ class SourceGenerator {
/// Checks whether the path is not in any default or TargetSource excludes
func isIncludedPath(_ path: Path) -> Bool {
return !defaultExcludedFiles.contains(where: { path.lastComponent.contains($0) })
&& !(path.extension.map(defaultExcludedExtensions.contains) ?? false)
&& !targetSourceExcludePaths.contains(path)
}