ios work

veilid-tools/ios_build.sh

@@ -1,20 +1,36 @@
 #!/bin/bash
 
 SCRIPTDIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
-CARGO_MANIFEST_PATH=$(python -c "import os; print(os.path.realpath(\"$SCRIPTDIR/Cargo.toml\"))")
+CARGO_MANIFEST_PATH=$(python3 -c "import os; print(os.path.realpath(\"$SCRIPTDIR/Cargo.toml\"))")
+TARGET_PATH=$(python3 -c "import os; print(os.path.realpath(\"$SCRIPTDIR/../target\"))")
+PACKAGE_NAME=$1
+shift
 # echo CARGO_MANIFEST_PATH: $CARGO_MANIFEST_PATH 
 
 if [ "$CONFIGURATION" == "Debug" ]; then 
     EXTRA_CARGO_OPTIONS="$@"
+    BUILD_MODE="debug"
 else
     EXTRA_CARGO_OPTIONS="$@ --release"
+    BUILD_MODE="release"
 fi
 ARCHS=${ARCHS:=arm64}
+
+if [ "$PLATFORM_NAME" == "iphonesimulator" ]; then
+    LIPO_OUT_NAME="lipo-ios-sim"
+else 
+    LIPO_OUT_NAME="lipo-ios"
+fi
+
 for arch in $ARCHS
 do
     if [ "$arch" == "arm64" ]; then
         echo arm64
-        CARGO_TARGET=aarch64-apple-ios
+        if [ "$PLATFORM_NAME" == "iphonesimulator" ]; then
+            CARGO_TARGET=aarch64-apple-ios-sim
+        else
+            CARGO_TARGET=aarch64-apple-ios
+        fi
         #CARGO_TOOLCHAIN=+ios-arm64-1.57.0
         CARGO_TOOLCHAIN=
     elif [ "$arch" == "x86_64" ]; then
@@ -40,5 +56,10 @@ do
     fi
 
     env -i PATH=/usr/bin:/bin:$HOMEBREW_DIR:$CARGO_DIR HOME="$HOME" USER="$USER" cargo $CARGO_TOOLCHAIN build $EXTRA_CARGO_OPTIONS --target $CARGO_TARGET --manifest-path $CARGO_MANIFEST_PATH
+
+    LIPOS="$LIPOS $TARGET_PATH/$CARGO_TARGET/$BUILD_MODE/lib$PACKAGE_NAME.a"
+
 done
 
+mkdir -p "$TARGET_PATH/$LIPO_OUT_NAME/$BUILD_MODE/"
+lipo $LIPOS -create -output "$TARGET_PATH/$LIPO_OUT_NAME/$BUILD_MODE/lib$PACKAGE_NAME.a"