kiwix / kiwix-build

Kiwix & openZIM build engine
GNU General Public License v3.0
86 stars 42 forks source link

CoreKiwix for iOS Simulator #668

Closed rgaudin closed 8 months ago

rgaudin commented 8 months ago

When we introduced CoreKiwix.xcframework, we made two mistakes:

This target mistake prevented XCode from finding our lib usable with the Simulator on x64. Not including an arm64 version obviously prevented Silicon-using devs from using the Simulator.

The included libs changes now from

Name Content
ios-arm64 All iOS devices are arm64
ios-x86_64-simulator Single x64 binary for Simulator
macos-arm64_x86_64 Fat binary for macOS with both x64 and arm64

To

Name Content
ios-arm64 All iOS devices are arm64
ios-arm64_x86_64-simulator Fsat binary for iOS Simulator with both x64 and arm64
macos-arm64_x86_64 Fat binary for macOS with both x64 and arm64

Changes

Fixes #667

Note: this may require a new build of the libkiwix 13.0.0 release. @kelson42 WDYT?

kelson42 commented 8 months ago

@rgaudin Thank you very much, yes we should make a new built of libkiwix13 or release 13.0.1.

rgaudin commented 8 months ago

OK will do ; recreating base deps 95 now as it doesn't include the new names

rgaudin commented 8 months ago

OK it's now all green ; pushing again to resolve the fixup. We're good to merge

mgautierfr commented 8 months ago

The today nightly has failed on macos apple_all_static (https://github.com/kiwix/kiwix-build/actions/runs/7094928431/job/19311027499). It is potentially related to this PR which may (if you have deleted them) have recreate base_deps2_* archives.

rgaudin commented 8 months ago

The today nightly has failed on macos apple_all_static (https://github.com/kiwix/kiwix-build/actions/runs/7094928431/job/19311027499). It is potentially related to this PR which may (if you have deleted them) have recreate base_deps2_* archives.

That's expected. I had to delete 96 and recreate it (in this PR) so it includes the new name. As you can see in the log, it lacks BUILD_iOS_x86_64 which is the former name of the iOSSimulator_x86_64 platform-target

mgautierfr commented 8 months ago

Would have been better to change the base_deps_version to 97 to avoid such conflict (for the next time). But we are good. I'm merging.