From 650b21ed7ed41768555f26ba0874a4dde88e01d5 Mon Sep 17 00:00:00 2001
From: Stefan Schmidt <s.schmidt@samsung.com>
Date: Wed, 29 May 2019 12:20:00 -0400
Subject: [PATCH] ci: enhance native bootstrap script for cross builds

Summary:
So far we only did generate a newer eolian_gen binary here due to the
frequent changes, but we really need way more native tools when doing the
cross build. Edje_cc, eet and elm_prefs_cc to name them.

Maintaining a special target for these (when they need almost all of
efl/elm anyway) looks like a burden so we are going with a full efl
build. Still speeding it up quite a bit by disabling bindings, examples
and tests when dong the native tooling build.

Reviewers: bu5hm4n, zmike

Reviewed By: zmike

Subscribers: cedric, #reviewers, #committers

Tags: #efl

Differential Revision: https://phab.enlightenment.org/D9041
---
 .ci/bootstrap-efl-native-for-cross.sh | 7 +++++++
 .ci/bootstrap_eolian.sh               | 7 -------
 .ci/ci-configure.sh                   | 2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)
 create mode 100755 .ci/bootstrap-efl-native-for-cross.sh
 delete mode 100755 .ci/bootstrap_eolian.sh

diff --git a/.ci/bootstrap-efl-native-for-cross.sh b/.ci/bootstrap-efl-native-for-cross.sh
new file mode 100755
index 0000000000..9a1272d77c
--- /dev/null
+++ b/.ci/bootstrap-efl-native-for-cross.sh
@@ -0,0 +1,7 @@
+#!/bin/sh
+
+mkdir build-bootstrap-native
+meson --prefix=/usr/ --libdir=/usr/lib -Dbuild-examples=false -Dbuild-tests=false -Dbindings="" build-bootstrap-native
+ninja -C build-bootstrap-native install
+rm -rf build-bootstrap-native
+ldconfig
diff --git a/.ci/bootstrap_eolian.sh b/.ci/bootstrap_eolian.sh
deleted file mode 100755
index 3e2734e714..0000000000
--- a/.ci/bootstrap_eolian.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/sh
-
-mkdir build-eolian-bootstrap
-meson --prefix=/usr/ --libdir=/usr/lib -Deolian-bootstrap=true build-eolian-bootstrap
-ninja -C build-eolian-bootstrap install
-rm -rf build-eolian-bootstrap
-ldconfig
diff --git a/.ci/ci-configure.sh b/.ci/ci-configure.sh
index 464380c0e0..77236ec655 100755
--- a/.ci/ci-configure.sh
+++ b/.ci/ci-configure.sh
@@ -111,7 +111,7 @@ else
     if [ "$1" = "mingw" ]; then
       OPTS="$OPTS $MINGW_COPTS"
       docker exec $(cat $HOME/cid) sh -c 'rm -f /src/config.cache'
-      docker exec $(cat $HOME/cid) sh -c '.ci/bootstrap_eolian.sh'
+      docker exec $(cat $HOME/cid) sh -c '.ci/bootstrap-efl-native-for-cross.sh'
     fi
     docker exec $(cat $HOME/cid) sh -c 'rm -f ~/.ccache/ccache.conf'
     travis_fold autoreconf autoreconf