restructure build for iphone

contrib/ci/drone-static-upload.sh

@@ -49,11 +49,7 @@ elif [ -e build-docs ]; then
     tar cJvf "$archive" "$base"
 elif [ -e build/iphone/ ]; then
     archive="$base.tar.xz"
-    mkdir -p "$base/sim"
-    mkdir -p "$base/device"
-    cp -av build/iphone/sim/llarp/liblokinet-embedded.a "$base/sim/liblokinet-embedded.a"
-    cp -av build/iphone/device/llarp/liblokinet-embedded.a "$base/device/liblokinet-embedded.a"
-    tar cJvf "$archive" "$base"
+    mv build/iphone/*.tar.xz "$archive"
 else
     cp -av daemon/lokinet daemon/lokinet-vpn "$base"
     cp -av ../contrib/bootstrap/mainnet.signed "$base/bootstrap.signed"

contrib/ios.sh

@@ -8,59 +8,28 @@ if ! [ -f LICENSE ] || ! [ -d llarp ]; then
     echo "You need to run this as ./contrib/ios.sh from the top-level lokinet project directory"
 fi
 
-unset SDKROOT
-export SDKROOT="$(xcrun --sdk iphoneos --show-sdk-path)"
 
-mkdir -p build/iphone/{sim,device}
+root="$(readlink -f $(dirname $0)/../)"
 
-cmake \
-    -G Ninja \
-    -DCMAKE_TOOLCHAIN_FILE=./contrib/cross/ios.toolchain.cmake -DPLATFORM=OS -DDEPLOYMENT_TARGET=13 -DENABLE_VISIBILITY=ON -DENABLE_BITCODE=OFF \
-    -DCMAKE_CXX_COMPILER_LAUNCHER= -DCMAKE_C_COMPILER_LAUNCHER= \
-    -DBUILD_STATIC_DEPS=ON \
-    -DBUILD_PACKAGE=OFF \
-    -DBUILD_SHARED_LIBS=OFF \
-    -DBUILD_TESTING=OFF \
-    -DBUILD_EMBEDDED_LOKINET=ON \
-    -DWITH_TESTS=OFF \
-    -DNATIVE_BUILD=OFF \
-    -DSTATIC_LINK=ON \
-    -DWITH_SYSTEMD=OFF \
-    -DWITH_BOOTSTRAP=OFF \
-    -DBUILD_DAEMON=OFF \
-    -DFORCE_OXENMQ_SUBMODULE=ON \
-    -DFORCE_OXENC_SUBMODULE=ON \
-    -DFORCE_NLOHMANN_SUBMODULE=ON \
-    -DFORCE_LIBUV_SUBMODULE=ON \
-    -DSUBMODULE_CHECK=ON \
-    -DWITH_LTO=OFF \
-    -S . -B build/iphone/device \
-    $@
+build_dir="$root/build/iphone"
 
-cmake \
-    -G Ninja \
-    -DCMAKE_TOOLCHAIN_FILE=./contrib/cross/ios.toolchain.cmake -DPLATFORM=SIMULATOR64 -DDEPLOYMENT_TARGET=13 -DENABLE_VISIBILITY=ON -DENABLE_BITCODE=OFF \
-    -DCMAKE_CXX_COMPILER_LAUNCHER= -DCMAKE_C_COMPILER_LAUNCHER= \
-    -DBUILD_STATIC_DEPS=ON \
-    -DBUILD_PACKAGE=OFF \
-    -DBUILD_SHARED_LIBS=OFF \
-    -DBUILD_TESTING=OFF \
-    -DBUILD_EMBEDDED_LOKINET=ON \
-    -DWITH_TESTS=OFF \
-    -DNATIVE_BUILD=OFF \
-    -DSTATIC_LINK=ON \
-    -DWITH_SYSTEMD=OFF \
-    -DWITH_BOOTSTRAP=OFF \
-    -DBUILD_DAEMON=OFF \
-    -DFORCE_OXENMQ_SUBMODULE=ON \
-    -DFORCE_OXENC_SUBMODULE=ON \
-    -DFORCE_NLOHMANN_SUBMODULE=ON \
-    -DFORCE_LIBUV_SUBMODULE=ON \
-    -DSUBMODULE_CHECK=ON \
-    -DWITH_LTO=OFF \
-    -S . -B build/iphone/sim \
-    $@
+./contrib/ios/ios-configure.sh "$build_dir/device" OS $@
+./contrib/ios/ios-configure.sh "$build_dir/sim" SIMULATORARM64 $@
 
-for targ in device sim ; do
-    cmake --build build/iphone/$targ --target lokinet-embedded
-done
+./contrib/ios/ios-build.sh "$build_dir/device"
+./contrib/ios/ios-build.sh "$build_dir/sim"
+
+pkg_name="iphone_lokinet_embedded_$(date +%s)"
+pkg_dir="$build_dir/$pkg_name"
+mkdir -p "$pkg_dir/include"
+mkdir -p "$pkg_dir/lib/device"
+mkdir -p "$pkg_dir/lib/sim"
+
+cp -a "$build_dir/device/llarp/liblokinet-embedded.a" "$pkg_dir/lib/device/"
+cp -a "$build_dir/sim/llarp/liblokinet-embedded.a" "$pkg_dir/lib/sim/"
+cp -a "$root"/include/lokinet{,/*}.h "$pkg_dir/include/"
+
+cd "$build_dir"
+tar cfv "$pkg_name.tar" $pkg_name
+cd -
+xz -T 0 "$build_dir/$pkg_name.tar"

contrib/ios/ios-build.sh

@@ -0,0 +1,7 @@
+#!/bin/bash
+#
+# Build the shit for iphone
+
+test -e $1 || ( echo "run ios-configure.sh first" ; exit 1 )
+
+cmake --build $1 --target lokinet-embedded

contrib/ios/ios-configure.sh

@@ -0,0 +1,39 @@
+#!/bin/bash
+#
+# configure step for ios
+
+root="$(readlink -f $(dirname $0)/../../)"
+
+unset SDKROOT
+export SDKROOT="$(xcrun --sdk iphoneos --show-sdk-path)"
+
+targ=$1
+plat=$2
+shift
+shift 
+
+mkdir -p $targ
+
+cmake \
+    -G Ninja \
+    -DCMAKE_TOOLCHAIN_FILE=./contrib/cross/ios.toolchain.cmake -DPLATFORM=$plat -DDEPLOYMENT_TARGET=13 -DENABLE_VISIBILITY=ON -DENABLE_BITCODE=OFF \
+    -DCMAKE_CXX_COMPILER_LAUNCHER= -DCMAKE_C_COMPILER_LAUNCHER= \
+    -DBUILD_STATIC_DEPS=ON \
+    -DBUILD_PACKAGE=OFF \
+    -DBUILD_SHARED_LIBS=OFF \
+    -DBUILD_TESTING=OFF \
+    -DBUILD_EMBEDDED_LOKINET=ON \
+    -DWITH_TESTS=OFF \
+    -DNATIVE_BUILD=OFF \
+    -DSTATIC_LINK=ON \
+    -DWITH_SYSTEMD=OFF \
+    -DWITH_BOOTSTRAP=OFF \
+    -DBUILD_DAEMON=OFF \
+    -DFORCE_OXENMQ_SUBMODULE=ON \
+    -DFORCE_OXENC_SUBMODULE=ON \
+    -DFORCE_NLOHMANN_SUBMODULE=ON \
+    -DFORCE_LIBUV_SUBMODULE=ON \
+    -DSUBMODULE_CHECK=ON \
+    -DWITH_LTO=OFF \
+    -S $root -B $targ \
+    $@

contrib/ios/readme.txt

@@ -1,12 +1,10 @@
-the internet is gripped by a spectre, the spectre of developing for the apple iphone.
 our scientists have yet to reverse engineer the correct way to use the apple build process as dictated on the official apple documentation so we have a made a hack to make it work until that occurs.
-
 the build process for embedded lokinet on iphone is as follows:
 
 * obtain holy water, sprinkle onto keyboard and single button trackpad accordingly.
 * run ./contrib/ios.sh
-* after it runs and the proper number of goats have been offered to the slaughter you will get a static object archive somewhere in ./build/iphone/
+* after it runs and the proper number of goats have been offered to the slaughter you will get an xz's tarball in the build/iphone/ directory
 
 additional cmake flags can be passed to ./contrib/ios.sh as command line arguments like so:
 
-    $ ./contrib/ios.sh -DPLATFORM=SIMULATOR64
+    $ ./contrib/ios.sh -DYOLO_SWAG=ON