Add iOS build task

.travis.yml

@@ -1,35 +1,70 @@
-language: rust
-# We use OSX so that we can get a reasonably up to date version of SQLCipher.
-# (The version in Travis's default Ubuntu Trusty is much too old).
-os: osx
-before_install:
-  - brew install sqlcipher --with-fts
-rust:
-  - 1.25.0  # Must align with `build/version.rs`.
-  - stable
-  - beta
-  - nightly
 matrix:
+  fast_finish: true
   allow_failures:
     - rust: nightly
-  fast_finish: true
-script:
-  - cargo test --verbose --all
-  - cargo test --features edn/serde_support --verbose --all
-  # We can't pick individual features out with `cargo test --all` (At the time of this writing, this
-  # works but does the wrong thing because of a bug in cargo, but its fix will be to disallow doing
-  # this all-together, see https://github.com/rust-lang/cargo/issues/5364 for more information). To
-  # work around this, we run individual tests for each subcrate individually.
-  - |
-    for manifest in $(find . -type f -name Cargo.toml); do
-      cargo test --manifest-path $manifest --verbose --no-default-features --features sqlcipher
-    done
-after_success:
-  - |
-    if [[ "$TRAVIS_PULL_REQUEST" = "false" && "$TRAVIS_BRANCH" == "master" ]]; then
-      cargo doc &&
-      echo "<meta http-equiv=refresh content=0;url=mentat/index.html>" > target/doc/index.html &&
-      git clone https://github.com/davisp/ghp-import.git &&
-      ./ghp-import/ghp_import.py -n -p -f -r https://"$GH_TOKEN"@github.com/"$TRAVIS_REPO_SLUG.git" target/doc
-    fi
-cache: cargo
+  include:
+    # - language: rust
+    #   # We use OSX so that we can get a reasonably up to date version of SQLCipher.
+    #   # (The version in Travis's default Ubuntu Trusty is much too old).
+    #   os: osx
+    #   before_install:
+    #     - brew install sqlcipher --with-fts
+    #   rust: 1.25.0  # Must align with `build/version.rs`.
+    #   script:
+    #     - ./scripts/cargo_test.sh
+    #   after_success:
+    #     - |
+    #       if [[ "$TRAVIS_PULL_REQUEST" = "false" && "$TRAVIS_BRANCH" == "master" ]]; then
+    #         cargo doc &&
+    #         echo "<meta http-equiv=refresh content=0;url=mentat/index.html>" > target/doc/index.html &&
+    #         git clone https://github.com/davisp/ghp-import.git &&
+    #         ./ghp-import/ghp_import.py -n -p -f -r https://"$GH_TOKEN"@github.com/"$TRAVIS_REPO_SLUG.git" target/doc
+    #       fi
+    #   cache: cargo
+    # - language: rust
+    #   # We use OSX so that we can get a reasonably up to date version of SQLCipher.
+    #   # (The version in Travis's default Ubuntu Trusty is much too old).
+    #   os: osx
+    #   before_install:
+    #     - brew install sqlcipher --with-fts
+    #   rust: stable
+    #   script:
+    #     - ./scripts/cargo_test.sh
+    #   cache: cargo
+    # - language: rust
+    #   # We use OSX so that we can get a reasonably up to date version of SQLCipher.
+    #   # (The version in Travis's default Ubuntu Trusty is much too old).
+    #   os: osx
+    #   before_install:
+    #     - brew install sqlcipher --with-fts
+    #   rust: beta
+    #   script:
+    #     - ./scripts/cargo_test.sh
+    #   cache: cargo
+    # - language: rust
+    #   # We use OSX so that we can get a reasonably up to date version of SQLCipher.
+    #   # (The version in Travis's default Ubuntu Trusty is much too old).
+    #   os: osx
+    #   before_install:
+    #     - brew install sqlcipher --with-fts
+    #   rust: nightly
+    #   script:
+    #     - ./scripts/cargo_test.sh
+    #   cache: cargo
+    - language: rust
+      dist: trusty
+      rust: stable
+      os: osx
+      install:
+        - rustup target add aarch64-apple-ios armv7-apple-ios armv7s-apple-ios x86_64-apple-ios i386-apple-ios
+        # Cargo-lipo needs to be Beta version available on master and not crates version to handle building in subdirectories
+        - cargo install --git https://github.com/TimNN/cargo-lipo
+        - instruments -s devices
+      script:
+        - >
+          cd ffi &&
+          cargo lipo --release &&
+          cd ..
+        - cd sdks/swift/Mentat
+        - xcodebuild -configuration Debug -scheme "Mentat Debug" -sdk iphonesimulator test -destination 'platform=iOS Simulator,name=iPhone X,OS=11.4'
+        - cd ../../..

cargo-config.toml.template

@@ -0,0 +1,11 @@
+[target.aarch64-linux-android]
+ar = "$PWD/NDK/arm64/bin/aarch64-linux-android-ar"
+linker = "$PWD/NDK/arm64/bin/aarch64-linux-android-clang"
+
+[target.armv7-linux-androideabi]
+ar = "$PWD/NDK/arm/bin/arm-linux-androideabi-ar"
+linker = "$PWD/NDK/arm/bin/arm-linux-androideabi-clang"
+
+[target.i686-linux-android]
+ar = "$PWD/NDK/x86/bin/i686-linux-android-ar"
+linker = "$PWD/NDK/x86/bin/i686-linux-android-clang"

scripts/cargo_test.sh

@@ -0,0 +1,11 @@
+#!/bin/bash
+
+cargo test --verbose --all
+cargo test --features edn/serde_support --verbose --all
+# We can't pick individual features out with `cargo test --all` (At the time of this writing, this
+# works but does the wrong thing because of a bug in cargo, but its fix will be to disallow doing
+# this all-together, see https://github.com/rust-lang/cargo/issues/5364 for more information). To
+# work around this, we run individual tests for each subcrate individually.
+for manifest in $(find . -type f -name Cargo.toml); do
+    cargo test --manifest-path $manifest --verbose --no-default-features --features sqlcipher
+done

scripts/ios_build.sh

@@ -2,4 +2,5 @@ cd ffi
 cargo lipo --release
 cd ..
 mkdir -p sdks/swift/Mentat/External-Dependencies/
+ls -la target/release
 cp target/universal/release/libmentat_ffi.a sdks/swift/Mentat/External-Dependencies/