xcframework_converter 0.5.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bc55b13f203a5434a0844c4e3e2bdab78de4cf7e9c518a4e504eb4513aaa65d6
-  data.tar.gz: 2867a3113f62112a2b324ec4822613edaa8168fbc75a2dc6ac398a074b481028
+  metadata.gz: 77324350e0b69d68739d71e4e2bd510b2c46e82076d82c066eb1af2ab7019ff0
+  data.tar.gz: dd8c817ba142772da87f18c46fffe50f32e2bad22d4bb8a9e3101650b38818a0
 SHA512:
-  metadata.gz: 6664a2115bd38a245669ac19a3504359641c790e613a472fe38f755c8f20c23bd38caa57333b6c5817e3d14c7185df8521ecb7394f28a431529d7f8ca5bcdfbe
-  data.tar.gz: 2cef2f4dc73b1e9091bd5f3580ec1c307ec40e5248c9732e0de781aa5d8a0b33f9e27e3befda29c5d924c9a6fccc9ef3aa1f9f6d11588297b796cedb66abf69a
+  metadata.gz: e7a7693803108e192822db1f4ab0de16bed32d4dc134dd3a69b1b6e54eab4e185e4d466d0626ecd46adc4c0bee677de8a9b8ca28d99485a0f5975147133cd94b
+  data.tar.gz: 59a9cac8d54309ddd9efea3901425ad5499cccac741cd6d35cb4a493794a8cf35d083ad63ba6e0528065cd717ee1521c7a8794cd445d2093813f65336af9209e

data/lib/arm64-to-sim/Sources/Arm64ToSimLib/Transmogrifier.swift

@@ -104,7 +104,7 @@ public enum Transmogrifier {
         return datas.merge()
     }
 
-    private static func updateVersionMin(_ data: Data, _ offset: UInt32, minos: UInt32, sdk: UInt32) -> Data {
+    private static func createLcBuildVersion(minos: UInt32, sdk: UInt32) -> Data {
         var command = build_version_command(cmd: UInt32(LC_BUILD_VERSION),
                                             cmdsize: UInt32(MemoryLayout<build_version_command>.stride),
                                             platform: UInt32(PLATFORM_IOSSIMULATOR),
@@ -115,6 +115,15 @@ public enum Transmogrifier {
         return Data(bytes: &command, count: MemoryLayout<build_version_command>.stride)
     }
 
+    private static func updateLcBuildVersion(_ data: Data, minos: UInt32, sdk: UInt32) -> Data {
+        var command: build_version_command = data.asStruct()
+        command.platform = UInt32(PLATFORM_IOSSIMULATOR)
+        command.minos = minos << 16 | 0 << 8 | 0
+        command.sdk = sdk << 16 | 0 << 8 | 0
+
+        return Data(bytes: &command, count: data.count)
+    }
+
     private static func updateDataInCode(_ data: Data, _ offset: UInt32) -> Data {
         var command: linkedit_data_command = data.asStruct()
         command.dataoff += offset
@@ -154,8 +163,6 @@ public enum Transmogrifier {
     }
 
     if contains_LC_VERSION_MIN_IPHONEOS {
-      // `offset` is kind of a magic number here, since we know that's the only meaningful change to binary size
-      // having a dynamic `offset` requires two passes over the load commands and is left as an exercise to the reader
       return updatePreiOS12ObjectFile
     } else {
       return updatePostiOS12ObjectFile
@@ -167,7 +174,7 @@ public enum Transmogrifier {
       let cmd = Int32(bitPattern: lc.loadCommand)
       switch cmd {
       case LC_BUILD_VERSION:
-          return updateVersionMin(lc, 0, minos: minos, sdk: sdk)
+          return updateLcBuildVersion(lc, minos: minos, sdk: sdk)
       default:
           return lc
       }
@@ -182,28 +189,25 @@ public enum Transmogrifier {
           case LC_SEGMENT_64:
               return updateSegment64(lc, offset)
           case LC_VERSION_MIN_IPHONEOS:
-              return updateVersionMin(lc, offset, minos: minos, sdk: sdk)
+              return createLcBuildVersion(minos: minos, sdk: sdk)
           case LC_DATA_IN_CODE, LC_LINKER_OPTIMIZATION_HINT:
               return updateDataInCode(lc, offset)
           case LC_SYMTAB:
               return updateSymTab(lc, offset)
           case LC_BUILD_VERSION:
-              return updateVersionMin(lc, offset, minos: minos, sdk: sdk)
+              fatalError("pre-12 object file shold not contain LC_BUILD_VERSION!")
           default:
               return lc
       }
   }
 
   static func updateDylibFile(lc: Data, minos: UInt32, sdk: UInt32) -> Data {
-    // `offset` is kind of a magic number here, since we know that's the only meaningful change to binary size
-    // having a dynamic `offset` requires two passes over the load commands and is left as an exercise to the reader
-    let offset = UInt32(abs(MemoryLayout<build_version_command>.stride - MemoryLayout<version_min_command>.stride))
     let cmd = Int32(bitPattern: lc.loadCommand)
     guard cmd != LC_BUILD_VERSION else {
         fatalError("This arm64 binary already contains an LC_BUILD_VERSION load command!")
     }
     if cmd == LC_VERSION_MIN_IPHONEOS {
-        return updateVersionMin(lc, offset, minos: minos, sdk: sdk)
+        return createLcBuildVersion(minos: minos, sdk: sdk)
     }
     return lc
   }

data/lib/xcframework_converter/arm_patcher.rb

@@ -37,9 +37,8 @@ module XCFrameworkConverter
         extracted_path = slice.path.join('arm64.dylib')
         `xcrun lipo \"#{slice.binary_path}\" -thin arm64 -output \"#{extracted_path}\"`
 
-        file = MachO::MachOFile.new(extracted_path)
-        sdk_version = file[:LC_VERSION_MIN_IPHONEOS].first.version_string
-        `xcrun vtool -arch arm64 -set-build-version 7 #{sdk_version} #{sdk_version} -replace -output \"#{extracted_path}\" \"#{extracted_path}\"`
+        minos_version, sdk_version = version_strings(extracted_path).map(&:to_i)
+        `xcrun vtool -arch arm64 -set-build-version 7 #{minos_version} #{sdk_version} -replace -output \"#{extracted_path}\" \"#{extracted_path}\"`
         `xcrun lipo \"#{slice.binary_path}\" -replace arm64 \"#{extracted_path}\" -output \"#{slice.binary_path}\"`
         extracted_path.rmtree
       end
@@ -63,36 +62,61 @@ module XCFrameworkConverter
         `xcrun lipo \"#{slice.binary_path}\" -thin arm64 -output \"#{extracted_path}\"`
         extracted_path_dir = slice.path.join('arm64-objects')
         extracted_path_dir.mkdir
-        object_files = `ar t \"#{extracted_path}\"`.split("\n").map(&:chomp).sort
-                                                   .select { |o| o.end_with?('.o') }
-                                                   .group_by(&:itself).transform_values(&:count)
-        processed_files = []
-        index = 0
-        while object_files.any?
-          object_files.keys.each do |object_file|
-            file_shard = Digest::MD5.hexdigest(object_file).to_s[0..2]
-            file_dir = extracted_path_dir.join("#{index}-#{file_shard}")
-            file_path = file_dir.join(object_file)
-            file_dir.mkdir unless file_dir.exist?
-            `ar p \"#{extracted_path}\" \"#{object_file}\" > \"#{file_path}\"`
-            macho_file = MachO::MachOFile.new(file_path)
-            sdk_version = macho_file[:LC_VERSION_MIN_IPHONEOS].first.version_string.to_i
-            `\"#{arm2sim_path}\" \"#{file_path}\" \"#{sdk_version}\" \"#{sdk_version}\"`
-            $stderr.printf '.'
-            processed_files << file_path
+        if macho_file_type(extracted_path) == :object
+          patch_object_file(extracted_path)
+        else
+          object_files = `ar t \"#{extracted_path}\"`.split("\n").map(&:chomp).sort
+                                                     .select { |o| o.end_with?('.o') }
+                                                     .group_by(&:itself).transform_values(&:count)
+          processed_files = []
+          index = 0
+          while object_files.any?
+            object_files.keys.each do |object_file|
+              file_shard = Digest::MD5.hexdigest(object_file).to_s[0..2]
+              file_dir = extracted_path_dir.join("#{index}-#{file_shard}")
+              file_path = file_dir.join(object_file)
+              file_dir.mkdir unless file_dir.exist?
+              `ar p \"#{extracted_path}\" \"#{object_file}\" > \"#{file_path}\"`
+              patch_object_file(file_path)
+              $stderr.printf '.'
+              processed_files << file_path
+            end
+            `ar d \"#{extracted_path}\" #{object_files.keys.map(&:shellescape).join(' ')}`
+            $stderr.printf '#'
+            object_files.reject! { |_, count| count <= index + 1 }
+            index += 1
           end
-          `ar d \"#{extracted_path}\" #{object_files.keys.map(&:shellescape).join(' ')}`
-          $stderr.printf '#'
-          object_files.reject! { |_, count| count <= index + 1 }
-          index += 1
+          $stderr.puts
+          `cd \"#{extracted_path_dir}\" ; ar cqv \"#{extracted_path}\" #{processed_files.map(&:shellescape).join(' ')}`
         end
-        $stderr.puts
-        `cd \"#{extracted_path_dir}\" ; ar cqv \"#{extracted_path}\" #{processed_files.map(&:shellescape).join(' ')}`
         `xcrun lipo \"#{slice.binary_path}\" -replace arm64 \"#{extracted_path}\" -output \"#{slice.binary_path}\"`
         extracted_path_dir.rmtree
         extracted_path.rmtree
       end
 
+      def macho_file_type(file_path)
+        MachO.open(file_path).filetype
+      rescue MachO::MagicError
+        nil
+      end
+
+      def patch_object_file(file_path)
+        minos_version, sdk_version = version_strings(file_path).map(&:to_i)
+        `\"#{arm2sim_path}\" \"#{file_path}\" \"#{minos_version}\" \"#{sdk_version}\"`
+      end
+
+      def version_strings(file_path)
+        macho_file = MachO::MachOFile.new(file_path)
+        if (version_min_command = macho_file.load_commands.find { |c| c.is_a?(MachO::LoadCommands::VersionMinCommand) })
+          return [version_min_command.version_string, version_min_command.sdk_string]
+        end
+        if (build_version_command = macho_file.load_commands.find { |c| c.is_a?(MachO::LoadCommands::BuildVersionCommand) })
+          return [build_version_command.minos_string, build_version_command.sdk_string]
+        end
+
+        raise "Could not find version strings in #{file_path}"
+      end
+
       public
 
       def cleanup_unused_archs(slice)

data/lib/xcframework_converter/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module XCFrameworkConverter
-  VERSION = '0.5.0'
+  VERSION = '0.6.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: xcframework_converter
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Igor Makarov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-05-09 00:00:00.000000000 Z
+date: 2022-05-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cocoapods