diff options
| author | Stefan Schmidt <s.schmidt@samsung.com> | 2019-06-19 09:26:18 -0400 |
|---|---|---|
| committer | Mike Blumenkrantz <zmike@samsung.com> | 2019-06-19 09:26:18 -0400 |
| commit | 2a22b5ecef79dddc2e575147ae7770516e24fca0 (patch) | |
| tree | a37745c6afb272d6ce31187e54a29975f43d170e /.ci/ci-configure.sh | |
| parent | 4279406e7de6970d1bada68b17aba5e67ec45cfc (diff) | |
| download | efl-2a22b5ecef79dddc2e575147ae7770516e24fca0.tar.gz | |
ci: rename some travis fold log names and add more
Summary:
For an easier to grasp travis output we are using the travis_fold and
endfold markers in our scripts. Renaming a few here to match the usage
of meson and ninja instead of make. Also adding a few more that have
been missing.
While we are add it remove a now silly extra mingw conditional.
Depends on D9119
Reviewers: zmike, bu5hm4n
Reviewed By: zmike
Subscribers: cedric, #reviewers, #committers
Tags: #efl
Differential Revision: https://phab.enlightenment.org/D9120
Diffstat (limited to '.ci/ci-configure.sh')
| -rwxr-xr-x | .ci/ci-configure.sh | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/.ci/ci-configure.sh b/.ci/ci-configure.sh index 44dba53f23..079886b25b 100755 --- a/.ci/ci-configure.sh +++ b/.ci/ci-configure.sh @@ -58,15 +58,19 @@ if [ "$DISTRO" != "" ] ; then if [ "$1" = "mingw" ]; then OPTS="$OPTS $MINGW_COPTS" + travis_fold cross-native cross-native docker exec $(cat $HOME/cid) sh -c '.ci/bootstrap-efl-native-for-cross.sh' - fi - if [ "$1" = "mingw" ]; then + travis_endfold cross-native + travis_fold meson meson docker exec --env EIO_MONITOR_POLL=1 --env PKG_CONFIG_PATH="/ewpi-64-install/lib/pkgconfig/" \ $(cat $HOME/cid) sh -c "mkdir build && meson build $OPTS" + travis_endfold meson else + travis_fold meson meson docker exec --env EIO_MONITOR_POLL=1 --env CC="ccache gcc" \ --env CXX="ccache g++" --env CFLAGS="-fdirectives-only" --env CXXFLAGS="-fdirectives-only" \ --env LD="ld.gold" $(cat $HOME/cid) sh -c "mkdir build && meson build $OPTS" + travis_endfold meson fi else # Prepare OSX env for build @@ -79,5 +83,7 @@ else export LDFLAGS="-L/usr/local/opt/openssl/lib $LDFLAGS" LIBFFI_VER=$(brew list --versions libffi|head -n1|cut -d' ' -f2) export PKG_CONFIG_PATH="/usr/local/opt/openssl/lib/pkgconfig:/usr/local/Cellar/libffi/$LIBFFI_VER/lib/pkgconfig" + travis_fold meson meson mkdir build && meson build -Decore-imf-loaders-disabler=scim,ibus -Dx11=false -Davahi=false -Dbindings=luajit -Deeze=false -Dsystemd=false -Dnls=false -Dcocoa=true -Demotion-loaders-disabler=gstreamer,gstreamer1,libvlc,xine + travis_endfold meson fi |