github-mirror/Telegram-iOS
1
0
Fork 0
mirror of https://github.com/TelegramMessenger/Telegram-iOS.git synced 2026-07-06 03:33:41 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Update

Browse source
This commit is contained in:
Isaac 2025-12-06 01:42:16 +08:00
parent 1ee7268488
commit dca1f06e91
5 changed files with 43 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

12
build-system/MakeProject/Sources/MakeProject/ProjectGenerator.swift
View file

@ -18,10 +18,16 @@ class ProjectGenerator {
let modules = try loadModules(from: modulesPath.string)
print("Loaded \(modules.count) modules")
// Filter out empty modules
// Filter out empty modules, but keep:
// - Modules with source files (excluding .a)
// - Static library modules (only .a files)
// - XCFramework imports
let validModules = modules.filter { name, module in
let sources = module.sources.filter { !$0.hasSuffix(".a") }
return !sources.isEmpty || module.type == "apple_static_xcframework_import"
let nonStaticSources = module.sources.filter { !$0.hasSuffix(".a") }
let staticLibs = module.sources.filter { $0.hasSuffix(".a") }
return !nonStaticSources.isEmpty ||
!staticLibs.isEmpty ||
module.type == "apple_static_xcframework_import"
}
print("Processing \(validModules.count) non-empty modules")

25
build-system/MakeProject/Sources/MakeProject/TargetBuilder.swift
View file

@ -343,6 +343,8 @@ class TargetBuilder {
// Track all frameworks we've added to avoid duplicates
var linkedFrameworks: Set<String> = []
// Track library search paths for static libraries
var staticLibSearchPaths: Set<String> = []
// Add target dependency (only for direct deps)
for depName in deps {
@ -375,18 +377,26 @@ class TargetBuilder {
// Link static libraries directly
for libPath in getStaticLibraries(for: depName) {
let libName = Path(libPath).lastComponent
// Use absolute path to the static library in bazel-out
let absolutePath = "$(SRCROOT)/../\(libPath)"
// Create an absolute path to the project root then to the static library
// SRCROOT is xcode-files, so we need to go up one level to get to telegram-ios
let projectRoot = outputDir.parent()
let absoluteLibPath = (projectRoot + libPath).string
let libRef = PBXFileReference(
sourceTree: .group,
sourceTree: .absolute,
name: libName,
lastKnownFileType: "archive.ar",
path: absolutePath
path: absoluteLibPath
)
pbxproj.add(object: libRef)
let buildFile = PBXBuildFile(file: libRef)
pbxproj.add(object: buildFile)
frameworksPhase.files?.append(buildFile)
// Add the library's directory to LIBRARY_SEARCH_PATHS
let libDir = Path(absoluteLibPath).parent().string
if !staticLibSearchPaths.contains(libDir) {
staticLibSearchPaths.insert(libDir)
}
}
linkedFrameworks.insert(depName)
continue
@ -412,7 +422,7 @@ class TargetBuilder {
}
// Update build configurations with dependency paths
if !depHeaderPaths.isEmpty || !deps.isEmpty {
if !depHeaderPaths.isEmpty || !deps.isEmpty || !staticLibSearchPaths.isEmpty {
for config in target.buildConfigurationList?.buildConfigurations ?? [] {
// Add header search paths
if !depHeaderPaths.isEmpty {
@ -422,6 +432,11 @@ class TargetBuilder {
// Ensure framework and module search paths include built products
config.buildSettings["FRAMEWORK_SEARCH_PATHS"] = "$(inherited) $(BUILT_PRODUCTS_DIR)"
config.buildSettings["SWIFT_INCLUDE_PATHS"] = "$(inherited) $(BUILT_PRODUCTS_DIR)"
// Add library search paths for static libraries
if !staticLibSearchPaths.isEmpty {
let existing = config.buildSettings["LIBRARY_SEARCH_PATHS"] as? String ?? "$(inherited)"
config.buildSettings["LIBRARY_SEARCH_PATHS"] = existing + " " + staticLibSearchPaths.sorted().joined(separator: " ")
}
}
}