summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Schmidt <s.schmidt@samsung.com>2019-12-09 14:41:17 +0100
committerMarcel Hollerbach <mail@marcel-hollerbach.de>2019-12-18 09:15:59 +0100
commitaf040650675fdd4c8bb56e6ef0390d32e21d88fd (patch)
treee13d7f7a8541e75a3d4da977288e3cc170eb1f06
parent3234d65b1e587a357e651fb84d6e1bbd6963733f (diff)
ci: refactor configuration script
Re-factor if-else block for easier reading, update comments and check that we are on osx when executing that part. Signed-off-by: Stefan Schmidt <s.schmidt@samsung.com> Reviewed-by: Marcel Hollerbach <mail@marcel-hollerbach.de> Differential Revision: https://phab.enlightenment.org/D10865
-rwxr-xr-x.ci/ci-configure.sh35
1 files changed, 12 insertions, 23 deletions
diff --git a/.ci/ci-configure.sh b/.ci/ci-configure.sh
index 88ca9e22ad..f9a58604e7 100755
--- a/.ci/ci-configure.sh
+++ b/.ci/ci-configure.sh
@@ -1,11 +1,9 @@
1#!/bin/sh 1#!/bin/sh
2 2
3set -e 3set -e
4
5. .ci/travis.sh 4. .ci/travis.sh
6 5
7if [ "$DISTRO" != "" ] ; then 6if [ "$DISTRO" != "" ] ; then
8 # Normal build test of all targets
9 # Why do we need to disable the imf loaders here? 7 # Why do we need to disable the imf loaders here?
10 OPTS=" -Decore-imf-loaders-disabler=scim,ibus" 8 OPTS=" -Decore-imf-loaders-disabler=scim,ibus"
11 9
@@ -14,9 +12,9 @@ if [ "$DISTRO" != "" ] ; then
14 WAYLAND_LINUX_COPTS=" -Dwl=true -Ddrm=true -Dopengl=es-egl -Dwl-deprecated=true -Ddrm-deprecated=true" 12 WAYLAND_LINUX_COPTS=" -Dwl=true -Ddrm=true -Dopengl=es-egl -Dwl-deprecated=true -Ddrm-deprecated=true"
15 13
16 # TODO: 14 # TODO:
17 # - Enable C++ bindings: -Dbindings=luajit,cxx
18 # - No libelogind package in fedora 30 repo 15 # - No libelogind package in fedora 30 repo
19 # - RPM fusion repo for xine and libvlc 16 # - RPM fusion repo for xine and libvlc
17 # - Ibus
20 ENABLED_LINUX_COPTS=" -Dfb=true -Dsdl=true -Dbuffer=true -Dbuild-id=travis-build \ 18 ENABLED_LINUX_COPTS=" -Dfb=true -Dsdl=true -Dbuffer=true -Dbuild-id=travis-build \
21 -Ddebug-threads=true -Dglib=true -Dg-mainloop=true -Dxpresent=true -Dxinput22=true \ 19 -Ddebug-threads=true -Dglib=true -Dg-mainloop=true -Dxpresent=true -Dxinput22=true \
22 -Devas-loaders-disabler=json -Decore-imf-loaders-disabler= -Demotion-loaders-disabler=libvlc,xine \ 20 -Devas-loaders-disabler=json -Decore-imf-loaders-disabler= -Demotion-loaders-disabler=libvlc,xine \
@@ -44,29 +42,24 @@ if [ "$DISTRO" != "" ] ; then
44 42
45 if [ "$1" = "default" ]; then 43 if [ "$1" = "default" ]; then
46 OPTS="$OPTS $MONO_LINUX_COPTS" 44 OPTS="$OPTS $MONO_LINUX_COPTS"
47 fi 45 elif [ "$1" = "options-enabled" ]; then
48
49 if [ "$1" = "options-enabled" ]; then
50 OPTS="$OPTS $ENABLED_LINUX_COPTS $WAYLAND_LINUX_COPTS" 46 OPTS="$OPTS $ENABLED_LINUX_COPTS $WAYLAND_LINUX_COPTS"
51 fi 47 elif [ "$1" = "options-disabled" ]; then
52
53 if [ "$1" = "options-disabled" ]; then
54 OPTS="$OPTS $DISABLED_LINUX_COPTS" 48 OPTS="$OPTS $DISABLED_LINUX_COPTS"
55 fi 49 elif [ "$1" = "wayland" ]; then
56
57 if [ "$1" = "wayland" ]; then
58 OPTS="$OPTS $WAYLAND_LINUX_COPTS" 50 OPTS="$OPTS $WAYLAND_LINUX_COPTS"
59 fi 51 elif [ "$1" = "release-ready" ]; then
60
61 if [ "$1" = "release-ready" ]; then
62 OPTS="$OPTS $RELEASE_READY_LINUX_COPTS" 52 OPTS="$OPTS $RELEASE_READY_LINUX_COPTS"
63 fi 53 elif [ "$1" = "coverity" ]; then
64
65 if [ "$1" = "coverity" ]; then
66 OPTS="$OPTS $WAYLAND_LINUX_COPTS" 54 OPTS="$OPTS $WAYLAND_LINUX_COPTS"
67 travis_fold cov-download cov-download 55 travis_fold cov-download cov-download
68 docker exec --env COVERITY_SCAN_TOKEN=$COVERITY_SCAN_TOKEN $(cat $HOME/cid) sh -c '.ci/coverity-tools-install.sh' 56 docker exec --env COVERITY_SCAN_TOKEN=$COVERITY_SCAN_TOKEN $(cat $HOME/cid) sh -c '.ci/coverity-tools-install.sh'
69 travis_endfold cov-download 57 travis_endfold cov-download
58 elif [ "$1" = "mingw" ]; then
59 OPTS="$OPTS $MINGW_COPTS"
60 travis_fold cross-native cross-native
61 docker exec $(cat $HOME/cid) sh -c '.ci/bootstrap-efl-native-for-cross.sh'
62 travis_endfold cross-native
70 fi 63 fi
71 64
72 if [ "$1" = "asan" ]; then 65 if [ "$1" = "asan" ]; then
@@ -76,10 +69,6 @@ if [ "$DISTRO" != "" ] ; then
76 --env LD="ld.gold" $(cat $HOME/cid) sh -c "mkdir build && meson build $OPTS -Db_sanitize=address" 69 --env LD="ld.gold" $(cat $HOME/cid) sh -c "mkdir build && meson build $OPTS -Db_sanitize=address"
77 travis_endfold meson 70 travis_endfold meson
78 elif [ "$1" = "mingw" ]; then 71 elif [ "$1" = "mingw" ]; then
79 OPTS="$OPTS $MINGW_COPTS"
80 travis_fold cross-native cross-native
81 docker exec $(cat $HOME/cid) sh -c '.ci/bootstrap-efl-native-for-cross.sh'
82 travis_endfold cross-native
83 travis_fold meson meson 72 travis_fold meson meson
84 docker exec --env EIO_MONITOR_POLL=1 --env PKG_CONFIG_PATH="/ewpi-64-install/lib/pkgconfig/" \ 73 docker exec --env EIO_MONITOR_POLL=1 --env PKG_CONFIG_PATH="/ewpi-64-install/lib/pkgconfig/" \
85 $(cat $HOME/cid) sh -c "mkdir build && meson build $OPTS" 74 $(cat $HOME/cid) sh -c "mkdir build && meson build $OPTS"
@@ -96,7 +85,7 @@ if [ "$DISTRO" != "" ] ; then
96 --env LD="ld.gold" $(cat $HOME/cid) sh -c "mkdir build && meson build $OPTS" 85 --env LD="ld.gold" $(cat $HOME/cid) sh -c "mkdir build && meson build $OPTS"
97 travis_endfold meson 86 travis_endfold meson
98 fi 87 fi
99else 88elif [ "$TRAVIS_OS_NAME" = "osx" ]; then
100 # Prepare OSX env for build 89 # Prepare OSX env for build
101 mkdir -p ~/Library/LaunchAgents 90 mkdir -p ~/Library/LaunchAgents
102 ln -sfv /usr/local/opt/d-bus/*.plist ~/Library/LaunchAgents 91 ln -sfv /usr/local/opt/d-bus/*.plist ~/Library/LaunchAgents