From d3c4b2170298bc7c6ef6b76bf09c9e2469a45b44 Mon Sep 17 00:00:00 2001
From: Piet Geursen <pietgeursen@gmail.com>
Date: Tue, 12 May 2020 18:05:28 +0200
Subject: [PATCH] Renable ios builds, copy headerfile when deploying.

---
 .gitignore          |  1 +
 .travis.yml         | 42 +++++++++++++++---------------------------
 ci/before_deploy.sh |  7 ++++---
 3 files changed, 20 insertions(+), 30 deletions(-)

diff --git a/.gitignore b/.gitignore
index 693699042..8d2b41ad8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 /target
+**/target/
 **/*.rs.bk
 Cargo.lock
diff --git a/.travis.yml b/.travis.yml
index 798654d65..e0c4038d0 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,16 +6,11 @@ language: rust
 services: docker
 sudo: required
 
-# TODO Rust builds on stable by default, this can be
-# overridden on a case by case basis down below.
-
 env:
   global:
     - CRATE_NAME=bamboo-rs
 
 matrix:
-  # TODO These are all the build jobs. Adjust as necessary. Comment out what you
-  # don't need
   include:
     # Android
     - env: TARGET=aarch64-linux-android DISABLE_TESTS=1
@@ -30,21 +25,21 @@ matrix:
       rust: nightly
 
     # iOS
-    #    - env: TARGET=aarch64-apple-ios DISABLE_TESTS=1
-    #      rust: nightly
-    #      os: osx
-    #    - env: TARGET=armv7-apple-ios DISABLE_TESTS=1
-    #      rust: nightly
-    #      os: osx
-    #    - env: TARGET=armv7s-apple-ios DISABLE_TESTS=1
-    #      rust: nightly
-    #      os: osx
-    #    - env: TARGET=i386-apple-ios DISABLE_TESTS=1
-    #      rust: nightly
-    #      os: osx
-    #    - env: TARGET=x86_64-apple-ios DISABLE_TESTS=1
-    #      rust: nightly
-    #      os: osx
+    - env: TARGET=aarch64-apple-ios DISABLE_TESTS=1
+      rust: nightly
+      os: osx
+    - env: TARGET=armv7-apple-ios DISABLE_TESTS=1
+      rust: nightly
+      os: osx
+    - env: TARGET=armv7s-apple-ios DISABLE_TESTS=1
+      rust: nightly
+      os: osx
+    - env: TARGET=i386-apple-ios DISABLE_TESTS=1
+      rust: nightly
+      os: osx
+    - env: TARGET=x86_64-apple-ios DISABLE_TESTS=1
+      rust: nightly
+      os: osx
 
     # Linux
     - env: TARGET=aarch64-unknown-linux-gnu
@@ -134,16 +129,9 @@ before_deploy:
   - sh ci/before_deploy.sh
 
 deploy:
-  # - Create a `public_repo` GitHub token. Go to: https://github.com/settings/tokens/new
-  # - Encrypt it: `travis encrypt 0123456789012345678901234567890123456789
-  # - Paste the output down here
   file_glob: true
   file: $CRATE_NAME-$TRAVIS_TAG-$TARGET.*
   on:
-    # TODO Here you can pick which targets will generate binary releases
-    # In this example, there are some targets that are tested using the stable
-    # and nightly channels. This condition makes sure there is only one release
-    # for such targets and that's generated using the stable channel
     condition: $TRAVIS_RUST_VERSION = nightly
     tags: true
   provider: releases
diff --git a/ci/before_deploy.sh b/ci/before_deploy.sh
index 62e7fd116..b635f45dc 100644
--- a/ci/before_deploy.sh
+++ b/ci/before_deploy.sh
@@ -17,14 +17,15 @@ main() {
 
     test -f Cargo.lock || cargo generate-lockfile
 
+    # TODO generate the c headerfile and copy it too.
     if [ -z $IS_NO_STD ]
     then
       cross build --target $TARGET --release
       cp target/$TARGET/release/bamboo-cli $stage/ || true
-      cp target/$TARGET/release/bamboo-cli.exe $stage/ || true
+      cp target/$TARGET/release/bamboo-cli.exe $stage/ || true # windows
       cp target/$TARGET/release/libbamboo_core.a $stage/ || true
       cp target/$TARGET/release/libbamboo_core.so $stage/ || true # this would fail for musl builds so fail quietly
-      cp target/$TARGET/release/libbamboo_core.dll $stage/ || true # if we're windows 
+      cp target/$TARGET/release/bamboo_core.dll $stage/ || true # if we're windows 
     else
       cd bamboo-core
       cross build -p bamboo-core --target $TARGET --release --no-default-features
@@ -32,7 +33,7 @@ main() {
       cd ..
     fi
 
-    #strip target/$TARGET/release
+    cp $src/bamboo-core/libbamboo.h $stage/
 
     cd $stage
     tar czf $src/$CRATE_NAME-$TRAVIS_TAG-$TARGET.tar.gz *