Updated to build for apple silicon catalyst

Author: terhechte

Cargo.toml

@@ -8,16 +8,12 @@ edition = "2018"
 
 [lib]
 name = "test1"
-crate-type = ["staticlib", "lib"]
+crate-type = ["staticlib"] 
 
 [build-dependencies]
 cbindgen = "*"
 
 [dependencies]
-lazy_static = "1.4.0"
-twox-hash = "1.5.0"
-foreign-types = "*"
-libc = "*"
 
 [profile.dev]
 panic = 'unwind'

XcodeIntegration/XcodeIntegration/Rust/libtest1_ios.a

@@ -0,0 +1,6 @@
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+void example(const void *swift_string, uintptr_t len);

XcodeIntegration/XcodeIntegration/Rust/libtest1_mac.a

@@ -4,7 +4,7 @@ use std::env;
 
 fn main() {
     let crate_dir = env::var("CARGO_MANIFEST_DIR").unwrap();
-    let filename = "test1_rust.h";
+    let filename = "XcodeIntegration/XcodeIntegration/Rust/test1_rust.h";
 
     let _build = cbindgen::Builder::new()
         .with_crate(crate_dir)

XcodeIntegration/XcodeIntegration/Rust/test1_rust.h

@@ -3,9 +3,42 @@
 # We need the SDK Root
 export SDKROOT=`xcrun --sdk macosx --show-sdk-path`
 
-# lipo together the different architectures into a universal 'fat' file
+# We will build two different frameworks:
+# The first one contains X86_64 iOS (Simulator) and ARM iOS
+# The other contains Catalyst ARM and Catalyst X86_64
+# Then we tell Xcode to only use the first one for iOS builds, 
+# and the second one for macOS builds.
+# The reason is that fat binaries can't contain the same architecture
+# slice twice (i.e. ARM64 iOS and ARM64 Catalyst)
+
+# Simulator:
+echo "Building for iOS X86_64 (Simulator)..."
+cargo build -Z build-std --target x86_64-apple-ios --release > /dev/null 2>&1
+
+# X86 Catalyst
 # use `cargo build-std` to automatically build the std for non-tier1 platforms
-# such as catalyst
-cargo +nightly build -Z build-std --target x86_64-apple-ios-macabi --release
-cargo build --target aarch64-apple-ios --release
-lipo -create -output target/libtest1.a target/{aarch64-apple-ios,x86_64-apple-ios-macabi}/release/libtest1.a
+echo "Building for Mac Catalyst X86_64..."
+cargo +nightly build -Z build-std --target x86_64-apple-ios-macabi --release > /dev/null 2>&1
+
+# ARM64 Catalyst
+echo "Building for Mac Catalyst ARM64..."
+cargo +myrust build -Z build-std --target aarch64-apple-ios-macabi --release > /dev/null 2>&1
+
+# iOS
+echo "Building for ARM iOS..."
+cargo build -Z build-std --target aarch64-apple-ios --release > /dev/null 2>&1
+
+
+# Build Fat Libraries:
+# lipo together the different architectures into a universal 'fat' file
+
+# macOS
+echo "Building Fat Libaries"
+lipo -create -output XcodeIntegration/XcodeIntegration/Rust/libtest1_mac.a target/{aarch64-apple-ios-macabi,x86_64-apple-ios-macabi}/release/libtest1.a
+
+echo "Wrote XcodeIntegration/XcodeIntegration/Rust/libtest1_ios.a"
+
+# iOS
+lipo -create -output XcodeIntegration/XcodeIntegration/Rust/libtest1_ios.a target/{aarch64-apple-ios,x86_64-apple-ios}/release/libtest1.a
+
+echo "Wrote XcodeIntegration/XcodeIntegration/Rust/libtest1_mac.a"

build.rs

@@ -1,30 +1,14 @@
-use std::collections::HashMap;
-use libc::c_char;
+use std::os::raw::c_void;
+use std::slice;
+use std::str;
 
-/// Free a markdown slide buffer.
 #[no_mangle]
-pub unsafe extern "C" fn example(buffer: *mut c_char) {
-    println!("Yeah");
+pub unsafe extern "C" fn example(
+    swift_string: *const c_void,
+    len: usize
+    ) {
+    let bytes: &[u8] = slice::from_raw_parts(swift_string as *mut u8 as _, len);
+    let string = str::from_utf8_unchecked(&bytes);
+    println!("String: {}", &string);
 }
 
-pub fn makeit() {
-    // Type inference lets us omit an explicit type signature (which
-    // would be `HashMap<String, String>` in this example).
-    let mut book_reviews = HashMap::new();
-
-    // Review some books.
-    book_reviews.insert(
-        "Adventures of Huckleberry Finn".to_string(),
-        "My favorite book.".to_string(),
-    );
-
-    println!("{:?}", &book_reviews);
-}
-
-#[cfg(test)]
-mod tests {
-    #[test]
-    fn it_works() {
-        assert_eq!(2 + 2, 4);
-    }
-}