chore: add ASMFLAGS option

Author: cxfksword

Sources/BuildScripts/XCFrameworkBuild/base.swift

@@ -268,6 +268,7 @@ class BaseBuild {
             "CPPFLAGS": cFlags,
             // 这个要加，不然cmake在编译maccatalyst 会有问题
             "CXXFLAGS": cFlags,
+            "ASMFLAGS": cFlags,
             "LDFLAGS": ldFlags,
             "PKG_CONFIG_LIBDIR": pkgConfigPath + pkgConfigPathDefault,
             "PATH": BaseBuild.defaultPath,
@@ -543,7 +544,7 @@ class BaseBuild {
         FileManager.default.createFile(atPath: path, contents: content.data(using: .utf8), attributes: nil)
     }
 
-    // CFBundleIdentifier must contain only alphanumerics, dots, hyphens 
+    // CFBundleIdentifier must contain only alphanumerics(a-z), dots(.), hyphens(-) 
     private func normalizeBundleIdentifier(_ identifier: String) -> String {
         return identifier.replacingOccurrences(of: "_", with: "-")
     }
@@ -744,9 +745,6 @@ class BaseBuild {
         } else {
             for target in library.targets {
                 let checksumFile = releaseDirPath + [target.name + ".xcframework.checksum.txt"]
-                if !FileManager.default.fileExists(atPath: checksumFile.path) {
-                    continue
-                }
                 let checksum = try String(contentsOf: checksumFile, encoding: .utf8).trimmingCharacters(in: .whitespacesAndNewlines)
                 dependencyTargetContent += """
 
@@ -790,6 +788,111 @@ class BaseBuild {
     }
 }
 
+class CombineBaseBuild : BaseBuild {
+
+    func combineFrameworkName() -> String {
+        "\(library.rawValue)-combined.a"
+    }
+
+    func combineFrameworks(platform: PlatformType, arch: ArchType) -> [String] {
+        let thinLibPath = thinDir(platform: platform, arch: arch) + ["lib"]
+        let staticLibraries = try? FileManager.default.contentsOfDirectory(atPath: thinLibPath.path).filter { $0.hasSuffix(".a") } 
+        guard let staticLibraries = staticLibraries else {
+            return []
+        }
+        // order by create date descending
+        let sortedFrameworks = staticLibraries.sorted {
+            let file1Path = thinLibPath + [$0]
+            let file2Path = thinLibPath + [$1]
+            let attr1 = try? FileManager.default.attributesOfItem(atPath: file1Path.path)
+            let attr2 = try? FileManager.default.attributesOfItem(atPath: file2Path.path)
+            let date1 = attr1?[FileAttributeKey.creationDate] as? Date ?? Date.distantPast
+            let date2 = attr2?[FileAttributeKey.creationDate] as? Date ?? Date.distantPast
+            return date1 < date2
+        }
+        return sortedFrameworks
+    }
+
+    override func frameworks() throws -> [String] {
+        ["\(library.rawValue)-combined"]
+    }
+
+    override func build(platform: PlatformType, arch: ArchType) throws {
+        try super.build(platform: platform, arch: arch)
+
+        try combineStaticLibraries(platform: platform, arch: arch)
+    }
+
+    func combineStaticLibraries(platform: PlatformType, arch: ArchType) throws {
+        let frameworks = self.combineFrameworks(platform: platform, arch: arch)
+        if frameworks.isEmpty {
+            return
+        }
+
+        print("Create combine static libraries...")
+        let thinLibPath = thinDir(platform: platform, arch: arch) + ["lib"]
+        var combinedLibName = combineFrameworkName()
+        if !combinedLibName.hasSuffix(".a") {
+            combinedLibName += ".a"
+        }
+        var paths: [String] = []
+        let prefix = thinDir(platform: platform, arch: arch)
+        if !FileManager.default.fileExists(atPath: prefix.path) {
+            throw NSError(domain: "no build for \(platform.rawValue) \(arch.rawValue)", code: 1)
+        }
+        for framework in frameworks {
+                let libname = framework.hasPrefix("lib") || framework.hasPrefix("Lib") ? framework : "lib" + framework
+                let libPath = prefix + ["lib", libname]
+                if !FileManager.default.fileExists(atPath: libPath.path) {
+                    throw NSError(domain: "no library \(libPath.path) for \(platform.rawValue) \(arch.rawValue)", code: 1)
+                }
+                paths.append(libPath.path)
+        }
+
+        let outputPath = prefix + ["lib", combinedLibName]
+        var arguments = ["-static"]
+        arguments.append(contentsOf: ["-o", outputPath.path])
+        for frameworkPath in paths {
+            arguments.append(frameworkPath)
+        }
+        if FileManager.default.fileExists(atPath: outputPath.path) {
+            try? FileManager.default.removeItem(at: outputPath)
+        }
+        try Utility.launch(path: "/usr/bin/libtool", arguments: arguments)
+
+        // move old static libraries to origin directory
+        let backupDirectory = thinLibPath + ["bak"]
+        try? FileManager.default.createDirectory(at: backupDirectory, withIntermediateDirectories: true, attributes: nil)
+        for framework in frameworks {
+            let libname = framework.hasPrefix("lib") || framework.hasPrefix("Lib") ? framework : "lib" + framework
+            let libPath = prefix + ["lib", libname]
+            let backupLibPath = backupDirectory + [libname]
+            try? FileManager.default.moveItem(at: libPath, to: backupLibPath)
+        }
+
+        // create combine pkgconfig
+        let pkgconfigPath = thinLibPath + ["pkgconfig", "\(library.rawValue).pc"]
+        if !FileManager.default.fileExists(atPath: pkgconfigPath.path) {
+            throw NSError(domain: "no pkgconfig \(pkgconfigPath.path) for \(platform.rawValue) \(arch.rawValue)", code: 1)
+        }
+
+        var content = try String(contentsOf: pkgconfigPath)
+        let combinedLibname = combinedLibName.hasPrefix("lib") ? String(combinedLibName.dropFirst(3).dropLast(2)) : String(combinedLibName.dropLast(2))
+        content = content.replacingOccurrences(
+            of: "-L\\$\\{libdir\\}((\\s+-l\\S+)+)",
+            with: "-L${libdir} -l\(combinedLibname)",
+            options: .regularExpression
+        )
+
+        // move old pkgconfig to origin directory
+        let backupPkgconfigPath = backupDirectory + [pkgconfigPath.lastPathComponent]
+        try? FileManager.default.moveItem(at: pkgconfigPath, to: backupPkgconfigPath)
+
+        // replace with combined pkgconfig
+        FileManager.default.createFile(atPath: pkgconfigPath.path, contents: content.data(using: .utf8), attributes: nil)
+    }
+
+}
 
 class ZipBaseBuild : BaseBuild {
 

Sources/BuildScripts/XCFrameworkBuild/main.swift

@@ -462,8 +462,14 @@ private class BuildFFMPEG: BaseBuild {
         FileManager.default.createFile(atPath: lldbFile.path, contents: nil, attributes: nil)
         let path = directoryURL + "libavcodec/videotoolbox.c"
         if let data = FileManager.default.contents(atPath: path.path), var str = String(data: data, encoding: .utf8) {
-            str = str.replacingOccurrences(of: "kCVPixelBufferOpenGLESCompatibilityKey", with: "kCVPixelBufferMetalCompatibilityKey")
-            str = str.replacingOccurrences(of: "kCVPixelBufferIOSurfaceOpenGLTextureCompatibilityKey", with: "kCVPixelBufferMetalCompatibilityKey")
+            var lines = str.components(separatedBy: .newlines)
+            for (index, line) in lines.enumerated() {
+                if line.contains("kCVPixelBufferIOSurfaceOpenGLTextureCompatibilityKey") {
+                    lines.insert("    CFDictionarySetValue(buffer_attributes, kCVPixelBufferMetalCompatibilityKey, kCFBooleanTrue);", at: index + 2)
+                    break
+                }
+            }
+            str = lines.joined(separator: "\n")
             try? str.write(toFile: path.path, atomically: true, encoding: .utf8)
         }
     }