feat: add iOS support to build script and distribution configuration

thewh1teagle · Dec 24, 2024 · 8315128 · 8315128
1 parent 4ba9632
commit 8315128
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 9 deletions.
diff --git a/crates/sherpa-rs-sys/build.rs b/crates/sherpa-rs-sys/build.rs
@@ -269,11 +269,6 @@ fn main() {
         std::fs::copy("src/bindings.rs", out_dir.join("bindings.rs"))
             .expect("Failed to copy bindings.rs");
     } else {
-        let mut clang_target = target.clone();
-        if target.contains("android") {
-            clang_target = "armv8-linux-androideabi".to_string();
-        }
-        debug_log!("clang target: {}", clang_target);
         let mut bindings_builder = bindgen::Builder::default()
             .header("wrapper.h")
             .clang_arg(format!("-I{}", sherpa_dst.display()))
@@ -387,7 +382,7 @@ fn main() {
             }
 
             // In Android, we need to set SHERPA_LIB_PATH to the cache directory sincie it has jniLibs
-            if target.contains("android") {
+            if target.contains("android") || target.contains("ios") {
                 env::set_var("SHERPA_LIB_PATH", cache_dir);
             } else {
                 env::set_var("SHERPA_LIB_PATH", cache_dir.join(&dist.name));

diff --git a/crates/sherpa-rs-sys/dist.json b/crates/sherpa-rs-sys/dist.json
@@ -32,9 +32,13 @@
         },
         "ios": {
             "archive": "sherpa-onnx-{tag}-ios.tar.bz2",
+            "arch": {
+                "aarch64-apple-ios": "ios-arm64",
+                "aarch64-apple-ios-sim": "ios-arm64-simulator"
+            },
             "libs": [
-                "build-ios/ios-onnxruntime/onnxruntime.xcframework",
-                "build-ios/sherpa-onnx.xcframework"
+                "build-ios/ios-onnxruntime/onnxruntime.xcframework/{arch}/libonnxruntime.a",
+                "build-ios/sherpa-onnx.xcframework/{arch}/libsherpa-onnx.a"
             ]
         }
     }

diff --git a/crates/sherpa-rs-sys/src/download_binaries.rs b/crates/sherpa-rs-sys/src/download_binaries.rs
@@ -139,8 +139,12 @@ impl DistTable {
         // debug_log!("dist table: {:?}", self);
         let target_dist = if target.contains("android") {
             self.targets.get("android").unwrap()
+        } else if target.contains("ios") {
+            self.targets.get("ios").unwrap()
         } else {
-            self.targets.get(target).unwrap()
+            self.targets
+                .get(target)
+                .expect(format!("Target {} not found", target).as_str())
         };
         debug_log!(
             "raw target_dist: {:?}",