GO-3906 Add ios simulator

anyproto · Aug 22, 2024 · 88b29ed · 88b29ed
1 parent 0515940
commit 88b29ed
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 0 deletions.
diff --git a/go.sum b/go.sum
@@ -1,15 +1,23 @@
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
+github.com/stretchr/objx v0.5.2/go.mod h1:FRsXN1f5AsAjCGJKqEizvkpNtU+EGNCLh3NxZ/8L+MA=
 github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg=
 github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
+github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
+golang.org/x/exp/shiny v0.0.0-20230817173708-d852ddb80c63/go.mod h1:UH99kUObWAZkDnWqppdQe5ZhPYESUw8I0zVV1uWBR+0=
+golang.org/x/image v0.16.0/go.mod h1:ugSZItdV4nOxyqp56HmXwH0Ry0nBCpjnZdpDaIHdoPs=
 golang.org/x/mobile v0.0.0-20240520174638-fa72addaaa1b h1:WX7nnnLfCEXg+FmdYZPai2XuP3VqCP1HZVMST0n9DF0=
 golang.org/x/mobile v0.0.0-20240520174638-fa72addaaa1b/go.mod h1:EiXZlVfUTaAyySFVJb9rsODuiO+WXu8HrUuySb7nYFw=
 golang.org/x/mod v0.17.0 h1:zY54UmvipHiNd+pm+m0x9KhZ9hl1/7QNMyxXbc6ICqA=
 golang.org/x/mod v0.17.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
+golang.org/x/net v0.25.0/go.mod h1:JkAGAh7GEvH74S6FOH42FLoXpXbE/aqXSrIQjXgsiwM=
 golang.org/x/sync v0.7.0 h1:YsImfSBoP9QPYL0xyKJPq0gcaJdG3rInoqxTWbfQu9M=
 golang.org/x/sync v0.7.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
+golang.org/x/sys v0.20.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/telemetry v0.0.0-20240228155512-f48c80bd79b2/go.mod h1:TeRTkGYfJXctD9OcfyVLyj2J3IxLnKwHJR8f4D8a3YE=
 golang.org/x/tools v0.21.0 h1:qc0xYgIbsSDt9EyWz05J5wfa7LOVW0YTLOXrqdLAWIw=
 golang.org/x/tools v0.21.0/go.mod h1:aiJjzUbINMkxbQROHiO6hDPo2LHcIPhhQsa9DLh0yGk=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=

diff --git a/rust/Makefile b/rust/Makefile
@@ -8,6 +8,7 @@ setup:
 	@rustup target add aarch64-linux-android
 	@rustup target add x86_64-linux-android
 	@rustup target add aarch64-apple-ios
+	@rustup target add aarch64-apple-ios-sim
 	@rustup target add x86_64-apple-ios
 	@rustup target add x86_64-apple-darwin
 	@rustup target add x86_64-apple-darwin
@@ -97,6 +98,20 @@ install-debug-ios-arm64: build-debug-ios-arm64
 	@mkdir -p ../libs/ios-arm64
 	@cp target/aarch64-apple-ios/debug/libtantivy_go.a ../libs/ios-arm64
 
+build-ios-arm64-sim:
+	cargo build --release --target aarch64-apple-ios-sim
+
+install-ios-arm64-sim: build-ios-arm64-sim
+	@mkdir -p ../libs/ios-arm64-sim
+	@cp target/aarch64-apple-ios-sim/release/libtantivy_go.a ../libs/ios-arm64-sim
+
+build-debug-ios-arm64-sim:
+	cargo build --target aarch64-apple-ios-sim
+
+install-debug-ios-arm64-sim: build-debug-ios-arm64-sim
+	@mkdir -p ../libs/ios-arm64-sim
+	@cp target/aarch64-apple-ios-sim/debug/libtantivy_go.a ../libs/ios-arm64-sim
+
 build-ios-amd64:
 	cargo build --release --target x86_64-apple-ios
 
@@ -160,6 +175,7 @@ install-all: \
     install-android-arm64 \
     install-android-amd64 \
     install-ios-arm64 \
+    install-ios-arm64-sim \
     install-ios-amd64 \
     install-darwin-amd64 \
     install-darwin-arm64 \
@@ -172,6 +188,7 @@ install-debug-all: \
     install-debug-android-arm64 \
     install-debug-android-amd64 \
     install-debug-ios-arm64 \
+    install-debug-ios-arm64-sim \
     install-debug-ios-amd64 \
     install-debug-darwin-amd64 \
     install-debug-darwin-arm64 \
@@ -190,6 +207,7 @@ TANTIVY_LIBS := android-386.tar.gz \
          darwin-arm64.tar.gz \
          ios-amd64.tar.gz \
          ios-arm64.tar.gz \
+         ios-arm64-sim.tar.gz \
          linux-amd64-musl.tar.gz \
          windows-amd64.tar.gz
 

diff --git a/rust/rust-toolchain.toml b/rust/rust-toolchain.toml
@@ -6,6 +6,7 @@ targets = [
     "aarch64-linux-android",
     "x86_64-linux-android",
     "aarch64-apple-ios",
+    "aarch64-apple-ios-sim",
     "x86_64-apple-ios",
     "x86_64-apple-darwin",
     "aarch64-apple-darwin",