summaryrefslogtreecommitdiff
path: root/.ci
diff options
context:
space:
mode:
authorMike Blumenkrantz <zmike@samsung.com>2019-06-18 10:20:32 -0400
committerStefan Schmidt <s.schmidt@samsung.com>2019-06-19 13:26:06 +0200
commit90f5d5e1f16513378fe5a39ef49ac793fb3fb254 (patch)
tree105aad299b11e335bb1ab286e2e342200b746f46 /.ci
parent47ada4f72c407ddf66a060e783030ff821233225 (diff)
ci: remove autotools-related conditionals
these are no longer used by anything Reviewed-by: Stefan Schmidt <stefan@datenfreihafen.org> Differential Revision: https://phab.enlightenment.org/D9108
Diffstat (limited to '.ci')
-rwxr-xr-x.ci/ci-configure.sh201
-rwxr-xr-x.ci/ci-make-benchmark.sh19
-rwxr-xr-x.ci/ci-make-check.sh39
-rwxr-xr-x.ci/ci-make-checkbuild.sh22
-rwxr-xr-x.ci/ci-make-distcheck.sh27
-rwxr-xr-x.ci/ci-make-examples.sh12
-rwxr-xr-x.ci/ci-make-install.sh17
-rwxr-xr-x.ci/ci-make.sh17
8 files changed, 80 insertions, 274 deletions
diff --git a/.ci/ci-configure.sh b/.ci/ci-configure.sh
index 75e16af1ec..e999b40a44 100755
--- a/.ci/ci-configure.sh
+++ b/.ci/ci-configure.sh
@@ -4,174 +4,61 @@ set -e
4 4
5. .ci/travis.sh 5. .ci/travis.sh
6 6
7if [ "$BUILDSYSTEM" = "ninja" ] ; then 7if [ "$DISTRO" != "" ] ; then
8 if [ "$DISTRO" != "" ] ; then 8 # Normal build test of all targets
9 # Normal build test of all targets 9 OPTS=" -Decore-imf-loaders-disabler=scim,ibus -Davahi=false -Dbindings=luajit"
10 OPTS=" -Decore-imf-loaders-disabler=scim,ibus -Davahi=false -Dbindings=luajit"
11 10
12 WAYLAND_LINUX_COPTS=" -Dwl=true -Ddrm=true -Dopengl=es-egl" 11 WAYLAND_LINUX_COPTS=" -Dwl=true -Ddrm=true -Dopengl=es-egl"
13 12
14 ENABLED_LINUX_COPTS=" -Dharfbuzz=true -Dhyphen=true" 13 ENABLED_LINUX_COPTS=" -Dharfbuzz=true -Dhyphen=true"
15 14
16 DISABLED_LINUX_COPTS=" -Dsystemd=false" 15 DISABLED_LINUX_COPTS=" -Dsystemd=false"
17 16
18 RELEASE_READY_LINUX_COPTS=" --buildtype=release" 17 RELEASE_READY_LINUX_COPTS=" --buildtype=release"
19 18
20 MINGW_COPTS="--cross-file .ci/cross_toolchain.txt -Davahi=false -Deeze=false -Dsystemd=false \ 19 MINGW_COPTS="--cross-file .ci/cross_toolchain.txt -Davahi=false -Deeze=false -Dsystemd=false \
21 -Dpulseaudio=false -Dx11=false -Dopengl=none -Dlibmount=false \ 20 -Dpulseaudio=false -Dx11=false -Dopengl=none -Dlibmount=false \
22 -Devas-loaders-disabler=pdf,ps,raw,svg -Devas-modules=static -Dbindings=luajit \ 21 -Devas-loaders-disabler=pdf,ps,raw,svg -Devas-modules=static -Dbindings=luajit \
23 -Dbuild-examples=false -Dbuild-tests=false" 22 -Dbuild-examples=false -Dbuild-tests=false"
24 23
25 if [ "$1" = "options-enabled" ]; then 24 if [ "$1" = "options-enabled" ]; then
26 OPTS="$OPTS $ENABLED_LINUX_COPTS $WAYLAND_LINUX_COPTS" 25 OPTS="$OPTS $ENABLED_LINUX_COPTS $WAYLAND_LINUX_COPTS"
27 fi
28
29 if [ "$1" = "options-disabled" ]; then
30 OPTS="$OPTS $DISABLED_LINUX_COPTS"
31 fi
32
33 if [ "$1" = "wayland" ]; then
34 OPTS="$OPTS $WAYLAND_LINUX_COPTS"
35 fi
36
37 if [ "$1" = "release-ready" ]; then
38 OPTS="$OPTS $RELEASE_READY_LINUX_COPTS"
39 fi
40
41 if [ "$1" = "mingw" ]; then
42 OPTS="$OPTS $MINGW_COPTS"
43 docker exec $(cat $HOME/cid) sh -c '.ci/bootstrap-efl-native-for-cross.sh'
44 fi
45 if [ "$1" = "mingw" ]; then
46 docker exec --env MAKEFLAGS="-j5 -rR" --env EIO_MONITOR_POLL=1 --env PKG_CONFIG_PATH="/ewpi-64-install/lib/pkgconfig/" \
47 $(cat $HOME/cid) sh -c "mkdir build && meson build $OPTS"
48 else
49 docker exec --env MAKEFLAGS="-j5 -rR" --env EIO_MONITOR_POLL=1 --env CC="ccache gcc" \
50 --env CXX="ccache g++" --env CFLAGS="-fdirectives-only" --env CXXFLAGS="-fdirectives-only" \
51 --env LD="ld.gold" $(cat $HOME/cid) sh -c "mkdir build && meson build $OPTS"
52 fi
53 else
54 # Prepare OSX env for build
55 mkdir -p ~/Library/LaunchAgents
56 ln -sfv /usr/local/opt/d-bus/*.plist ~/Library/LaunchAgents
57 launchctl load ~/Library/LaunchAgents/org.freedesktop.dbus-session.plist
58 export PATH="/usr/local/opt/ccache/libexec:$(brew --prefix gettext)/bin:$PATH"
59
60 export CFLAGS="-I/usr/local/opt/openssl/include -frewrite-includes $CFLAGS"
61 export LDFLAGS="-L/usr/local/opt/openssl/lib $LDFLAGS"
62 LIBFFI_VER=$(brew list --versions libffi|head -n1|cut -d' ' -f2)
63 export PKG_CONFIG_PATH="/usr/local/opt/openssl/lib/pkgconfig:/usr/local/Cellar/libffi/$LIBFFI_VER/lib/pkgconfig"
64 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
65 fi 26 fi
66else
67 CI_BUILD_TYPE="$1"
68
69 DEFAULT_LINUX_COPTS="--prefix=/usr/ --with-tests=regular --disable-cxx-bindings --disable-dependency-tracking -C"
70
71 WAYLAND_LINUX_COPTS=" --enable-wayland --enable-elput --enable-drm \
72 --enable-wayland-ivi-shell --enable-gl-drm --with-opengl=es --enable-egl"
73
74 ENABLED_LINUX_COPTS=" --enable-harfbuzz --enable-liblz4 --enable-image-loader-webp --enable-xinput22 \
75 --enable-multisense --enable-lua-old --enable-xpresent --enable-hyphen \
76 --enable-pixman --enable-pixman-font --enable-pixman-rect --enable-pixman-line \
77 --enable-pixman-poly --enable-pixman-image --enable-pixman-image-scale-sample \
78 --enable-image-loader-generic --enable-libuv --enable-tile-rotate --enable-vnc-server \
79 --enable-fb --enable-v4l2 --enable-cserve \
80 --enable-ecore-wayland --enable-ecore-drm --enable-cancel-ok --with-crypto=gnutls \
81 --enable-debug --disable-gstreamer1 --enable-gstreamer"
82
83 # Not compatible with Open GL ES and thus the wayland options. Need to think about having different
84 # jobs for the different supported GL flavours.
85 #--enable-sdl
86
87 DISABLED_LINUX_COPTS=" --disable-neon --disable-libeeze --disable-systemd --disable-magic-debug \
88 --disable-valgrind --disable-gstreamer1 \
89 --disable-fontconfig --disable-fribidi --disable-poppler --disable-spectre --disable-libraw \
90 --disable-librsvg --disable-xcf --disable-libmount --disable-tslib --disable-audio \
91 --disable-pulseaudio --disable-avahi --disable-xinput2 --disable-xim --disable-scim \
92 --disable-ibus --disable-physics --disable-quick-launch --disable-elua"
93
94 RELEASE_READY_LINUX_COPTS=" --with-profile=release"
95 27
96 MINGW_COPTS=" --prefix=/ewpi-64-install --host=x86_64-w64-mingw32 --with-eolian-gen=/usr/bin/eolian_gen \ 28 if [ "$1" = "options-disabled" ]; then
97 --with-edje-cc=/usr/bin/edje_cc --with-eet-eet=/usr/bin/eet \ 29 OPTS="$OPTS $DISABLED_LINUX_COPTS"
98 --with-bin-elm-prefs-cc=/usr/bin/elm_prefs_cc \ 30 fi
99 --disable-static --with-tests=regular --with-crypto=openssl \
100 --disable-libmount --disable-valgrind --disable-avahi --disable-spectre --disable-libraw \
101 --disable-librsvg --disable-pulseaudio --disable-cxx-bindings"
102
103 patch -p1 < .ci/efl.m4.diff
104 sed -i.orig 's/AC_INIT\(.*\)efl_version-[a-zA-Z0-9]\+/AC_INIT\1efl_version/g' configure.ac
105
106 if [ "$DISTRO" != "" ] ; then
107 # Normal build test of all targets
108 OPTS="$DEFAULT_LINUX_COPTS"
109
110 if [ "$1" = "options-enabled" ]; then
111 OPTS="$OPTS $ENABLED_LINUX_COPTS $WAYLAND_LINUX_COPTS"
112 fi
113
114 if [ "$1" = "options-disabled" ]; then
115 OPTS="$OPTS $DISABLED_LINUX_COPTS"
116 fi
117 31
118 if [ "$1" = "wayland" ]; then 32 if [ "$1" = "wayland" ]; then
119 OPTS="$OPTS $WAYLAND_LINUX_COPTS" 33 OPTS="$OPTS $WAYLAND_LINUX_COPTS"
120 fi 34 fi
121 35
122 if [ "$1" = "release-ready" ]; then 36 if [ "$1" = "release-ready" ]; then
123 OPTS="$OPTS $RELEASE_READY_LINUX_COPTS" 37 OPTS="$OPTS $RELEASE_READY_LINUX_COPTS"
124 fi 38 fi
125 39
126 if [ "$1" = "mingw" ]; then 40 if [ "$1" = "mingw" ]; then
127 OPTS="$OPTS $MINGW_COPTS" 41 OPTS="$OPTS $MINGW_COPTS"
128 docker exec $(cat $HOME/cid) sh -c 'rm -f /src/config.cache' 42 docker exec $(cat $HOME/cid) sh -c '.ci/bootstrap-efl-native-for-cross.sh'
129 docker exec $(cat $HOME/cid) sh -c '.ci/bootstrap-efl-native-for-cross.sh' 43 fi
130 fi 44 if [ "$1" = "mingw" ]; then
131 docker exec $(cat $HOME/cid) sh -c 'rm -f ~/.ccache/ccache.conf' 45 docker exec --env MAKEFLAGS="-j5 -rR" --env EIO_MONITOR_POLL=1 --env PKG_CONFIG_PATH="/ewpi-64-install/lib/pkgconfig/" \
132 travis_fold autoreconf autoreconf 46 $(cat $HOME/cid) sh -c "mkdir build && meson build $OPTS"
133 if [ "$1" = "mingw" ]; then
134 docker exec $(cat $HOME/cid) sh -c 'rm -f /src/config.cache'
135 docker exec --env MAKEFLAGS="-j5 -rR" --env EIO_MONITOR_POLL=1 --env CFLAGS="-pipe" --env CXXFLAGS="-pipe" \
136 --env CPPFLAGS="-I/ewpi-64-install/include -DECORE_WIN32_WIP_POZEFLKSD" --env LDFLAGS="-L/ewpi-64-install/lib/" --env PKG_CONFIG_PATH="/ewpi-64-install/lib/pkgconfig/" \
137 $(cat $HOME/cid) sh -c "autoreconf -iv"
138 else
139 docker exec --env MAKEFLAGS="-j5 -rR" --env EIO_MONITOR_POLL=1 --env CC="ccache gcc" \
140 --env CXX="ccache g++" --env CFLAGS="-fdirectives-only" --env CXXFLAGS="-fdirectives-only" \
141 --env LD="ld.gold" $(cat $HOME/cid) sh -c "LIBTOOLIZE_OPTIONS='--no-warn' autoreconf -iv"
142 fi
143 travis_endfold autoreconf
144 travis_fold configure "configure $OPTS"
145 if [ "$1" = "mingw" ]; then
146 docker exec --env MAKEFLAGS="-j5 -rR" --env EIO_MONITOR_POLL=1 --env CFLAGS="-pipe" --env CXXFLAGS="-pipe" \
147 --env CPPFLAGS="-I/ewpi-64-install/include -DECORE_WIN32_WIP_POZEFLKSD" --env LDFLAGS="-L/ewpi-64-install/lib/" --env PKG_CONFIG_PATH="/ewpi-64-install/lib/pkgconfig/" \
148 $(cat $HOME/cid) sh -c ".ci/configure.sh $OPTS"
149 else
150 docker exec --env MAKEFLAGS="-j5 -rR" --env EIO_MONITOR_POLL=1 --env CC="ccache gcc" \
151 --env CXX="ccache g++" --env CFLAGS="-fdirectives-only" --env CXXFLAGS="-fdirectives-only" \
152 --env LD="ld.gold" $(cat $HOME/cid) sh -c ".ci/configure.sh $OPTS"
153 fi
154 else 47 else
155 OSX_COPTS="--disable-cxx-bindings --with-tests=regular --disable-dependency-tracking -C" 48 docker exec --env MAKEFLAGS="-j5 -rR" --env EIO_MONITOR_POLL=1 --env CC="ccache gcc" \
156 49 --env CXX="ccache g++" --env CFLAGS="-fdirectives-only" --env CXXFLAGS="-fdirectives-only" \
157 # Prepare OSX env for build 50 --env LD="ld.gold" $(cat $HOME/cid) sh -c "mkdir build && meson build $OPTS"
158 mkdir -p ~/Library/LaunchAgents
159 ln -sfv /usr/local/opt/d-bus/*.plist ~/Library/LaunchAgents
160 launchctl load ~/Library/LaunchAgents/org.freedesktop.dbus-session.plist
161 export PATH="/usr/local/opt/ccache/libexec:$(brew --prefix gettext)/bin:$PATH"
162
163 export CFLAGS="-I/usr/local/opt/openssl/include -frewrite-includes $CFLAGS"
164 export LDFLAGS="-L/usr/local/opt/openssl/lib $LDFLAGS"
165 LIBFFI_VER=$(brew list --versions libffi|head -n1|cut -d' ' -f2)
166 export PKG_CONFIG_PATH="/usr/local/opt/openssl/lib/pkgconfig:/usr/local/Cellar/libffi/$LIBFFI_VER/lib/pkgconfig"
167
168 # Normal build test of all targets
169 rm -f ~/.ccache/ccache.conf
170 travis_fold autoreconf autoreconf
171 LIBTOOLIZE_OPTIONS='--no-warn' autoreconf -iv
172 travis_endfold autoreconf
173 travis_fold configure "configure $OSX_COPTS"
174 .ci/configure.sh $OSX_COPTS
175 fi 51 fi
176 travis_endfold configure 52else
53 # Prepare OSX env for build
54 mkdir -p ~/Library/LaunchAgents
55 ln -sfv /usr/local/opt/d-bus/*.plist ~/Library/LaunchAgents
56 launchctl load ~/Library/LaunchAgents/org.freedesktop.dbus-session.plist
57 export PATH="/usr/local/opt/ccache/libexec:$(brew --prefix gettext)/bin:$PATH"
58
59 export CFLAGS="-I/usr/local/opt/openssl/include -frewrite-includes $CFLAGS"
60 export LDFLAGS="-L/usr/local/opt/openssl/lib $LDFLAGS"
61 LIBFFI_VER=$(brew list --versions libffi|head -n1|cut -d' ' -f2)
62 export PKG_CONFIG_PATH="/usr/local/opt/openssl/lib/pkgconfig:/usr/local/Cellar/libffi/$LIBFFI_VER/lib/pkgconfig"
63 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
177fi 64fi
diff --git a/.ci/ci-make-benchmark.sh b/.ci/ci-make-benchmark.sh
index 9f297a5fcb..7572b5ae51 100755
--- a/.ci/ci-make-benchmark.sh
+++ b/.ci/ci-make-benchmark.sh
@@ -6,14 +6,13 @@ if [ "$1" = "release-ready" ] ; then
6 exit 0 6 exit 0
7fi 7fi
8travis_fold benchmark "make benchmark" 8travis_fold benchmark "make benchmark"
9if [ "$BUILDSYSTEM" = "ninja" ] ; then 9echo "Nothing to do here, the benchmarks don't seem to terminate"
10 echo "Nothing to do here, the benchmarks don't seem to terminate" 10#else
11else 11 #if [ "$DISTRO" != "" ] ; then
12 if [ "$DISTRO" != "" ] ; then 12 #docker exec --env MAKEFLAGS="-j5 -rR" --env EIO_MONITOR_POLL=1 $(cat $HOME/cid) make benchmark
13 docker exec --env MAKEFLAGS="-j5 -rR" --env EIO_MONITOR_POLL=1 $(cat $HOME/cid) make benchmark 13 #else
14 else 14 #export PATH="/usr/local/opt/ccache/libexec:$(brew --prefix gettext)/bin:$PATH"
15 export PATH="/usr/local/opt/ccache/libexec:$(brew --prefix gettext)/bin:$PATH" 15 #make benchmark
16 make benchmark 16 #fi
17 fi 17#fi
18fi
19travis_endfold benchmark 18travis_endfold benchmark
diff --git a/.ci/ci-make-check.sh b/.ci/ci-make-check.sh
index ff8f5e0894..bea7ca7b1a 100755
--- a/.ci/ci-make-check.sh
+++ b/.ci/ci-make-check.sh
@@ -17,36 +17,17 @@ fi
17NUM_TRIES=5 17NUM_TRIES=5
18 18
19travis_fold check "make check-TESTS" 19travis_fold check "make check-TESTS"
20if [ "$BUILDSYSTEM" = "ninja" ] ; then 20if [ "$DISTRO" != "" ] ; then
21 if [ "$DISTRO" != "" ] ; then 21 # disable them for this distros, after meson 0.49 is out, this can be removed
22 # disable them for this distros, after meson 0.49 is out, this can be removed 22 # https://github.com/mesonbuild/meson/commit/253c581412d7f2b09af353dd83d943454bd555be
23 # https://github.com/mesonbuild/meson/commit/253c581412d7f2b09af353dd83d943454bd555be 23 if [ "$DISTRO" != "Ubuntu1810" ] && [ "$DISTRO" != "Debian96" ]; then
24 if [ "$DISTRO" != "Ubuntu1810" ] && [ "$DISTRO" != "Debian96" ]; then 24 for tries in $(seq 1 ${NUM_TRIES}); do
25 for tries in $(seq 1 ${NUM_TRIES}); do 25 (docker exec --env EINA_LOG_BACKTRACE="0" --env EIO_MONITOR_POLL=1 $(cat $HOME/cid) meson test -t 120 -C build --wrapper dbus-launch ) && break
26 (docker exec --env EINA_LOG_BACKTRACE="0" --env EIO_MONITOR_POLL=1 $(cat $HOME/cid) meson test -t 120 -C build --wrapper dbus-launch ) && break 26 docker exec --env EIO_MONITOR_POLL=1 $(cat $HOME/cid) cat build/meson-logs/testlog-dbus-launch.txt
27 docker exec --env EIO_MONITOR_POLL=1 $(cat $HOME/cid) cat build/meson-logs/testlog-dbus-launch.txt 27 if [ $tries != ${NUM_TRIES} ] ; then echo "tests failed, trying again!" ; fi
28 if [ $tries != ${NUM_TRIES} ] ; then echo "tests failed, trying again!" ; fi 28 false
29 false 29 done
30 done
31 fi
32 fi 30 fi
33else
34 if [ "$DISTRO" != "" ] ; then
35 for tries in $(seq 1 ${NUM_TRIES}); do
36 (docker exec --env EINA_LOG_BACKTRACE="0" --env MAKEFLAGS="-j5 -rR" --env EIO_MONITOR_POLL=1 $(cat $HOME/cid) make -j2 -C src/ check-TESTS) && break
37 docker exec --env MAKEFLAGS="-j5 -rR" --env EIO_MONITOR_POLL=1 $(cat $HOME/cid) cat src/test-suite.log
38 if [ $tries != ${NUM_TRIES} ] ; then echo "tests failed, trying again!" ; fi
39 false
40 done
41 #else
42 #export PATH="/usr/local/opt/ccache/libexec:$(brew --prefix gettext)/bin:$PATH"
43 #for tries in 1 2 3 ; do
44 #make -j2 -C src/ check-TESTS && break
45 #cat src/test-suite.log
46 #if [ $tries != 3 ] ; then echo "tests failed, trying again!" ; fi
47 #false
48 #done
49 fi
50fi 31fi
51ret=$? 32ret=$?
52travis_endfold check 33travis_endfold check
diff --git a/.ci/ci-make-checkbuild.sh b/.ci/ci-make-checkbuild.sh
deleted file mode 100755
index 88ca687d42..0000000000
--- a/.ci/ci-make-checkbuild.sh
+++ /dev/null
@@ -1,22 +0,0 @@
1#!/bin/sh
2
3set -e
4. .ci/travis.sh
5if [ "$1" = "release-ready" ] ; then
6 exit 0
7fi
8if [ "$1" = "mingw" ] ; then
9 exit 0
10fi
11travis_fold check-build "make check-build"
12if [ "$BUILDSYSTEM" = "ninja" ] ; then
13 echo "Nothing to do here"
14else
15 if [ "$DISTRO" != "" ] ; then
16 docker exec --env MAKEFLAGS="-j5 -rR" --env EIO_MONITOR_POLL=1 $(cat $HOME/cid) make check-build
17 else
18 export PATH="/usr/local/opt/ccache/libexec:$(brew --prefix gettext)/bin:$PATH"
19 make check-build
20 fi
21fi
22travis_endfold check-build
diff --git a/.ci/ci-make-distcheck.sh b/.ci/ci-make-distcheck.sh
index 59b096a2ee..9876671d32 100755
--- a/.ci/ci-make-distcheck.sh
+++ b/.ci/ci-make-distcheck.sh
@@ -6,27 +6,14 @@ if [ "$1" != "release-ready" ] ; then
6 exit 0 6 exit 0
7fi 7fi
8travis_fold distcheck "make distcheck" 8travis_fold distcheck "make distcheck"
9if [ "$BUILDSYSTEM" = "ninja" ] ; then
10if [ "$DISTRO" != "" ] ; then 9if [ "$DISTRO" != "" ] ; then
11 docker exec --env MAKEFLAGS="-j5 -rR" --env EIO_MONITOR_POLL=1 --env CC="ccache gcc" \ 10 docker exec --env MAKEFLAGS="-j5 -rR" --env EIO_MONITOR_POLL=1 --env CC="ccache gcc" \
12 --env CXX="ccache g++" \ 11 --env CXX="ccache g++" \
13 --env CFLAGS="-fdirectives-only" --env CXXFLAGS="-fdirectives-only" \ 12 --env CFLAGS="-fdirectives-only" --env CXXFLAGS="-fdirectives-only" \
14 --env LD="ld.gold" $(cat $HOME/cid) dbus-launch ninja -C build dist || \ 13 --env LD="ld.gold" $(cat $HOME/cid) dbus-launch ninja -C build dist || \
15 (sudo cat efl-*/_build/sub/src/test-suite.log; false) 14 (sudo cat efl-*/_build/sub/src/test-suite.log; false)
16 else
17 export PATH="/usr/local/opt/ccache/libexec:$(brew --prefix gettext)/bin:$PATH"
18 ninja -C build dist
19 fi
20else 15else
21 if [ "$DISTRO" != "" ] ; then 16 export PATH="/usr/local/opt/ccache/libexec:$(brew --prefix gettext)/bin:$PATH"
22 docker exec --env MAKEFLAGS="-j5 -rR" --env EIO_MONITOR_POLL=1 --env CC="ccache gcc" \ 17 ninja -C build dist
23 --env CXX="ccache g++" \
24 --env CFLAGS="-fdirectives-only" --env CXXFLAGS="-fdirectives-only" \
25 --env LD="ld.gold" $(cat $HOME/cid) bash -c .ci/distcheck.sh || \
26 (sudo cat efl-*/_build/sub/src/test-suite.log; false)
27 else
28 export PATH="/usr/local/opt/ccache/libexec:$(brew --prefix gettext)/bin:$PATH"
29 make
30 fi
31fi 18fi
32travis_endfold distcheck 19travis_endfold distcheck
diff --git a/.ci/ci-make-examples.sh b/.ci/ci-make-examples.sh
index ae8aa736ca..9ffa6e1c6f 100755
--- a/.ci/ci-make-examples.sh
+++ b/.ci/ci-make-examples.sh
@@ -6,14 +6,6 @@ if [ "$1" = "release-ready" ] ; then
6 exit 0 6 exit 0
7fi 7fi
8travis_fold examples "make examples" 8travis_fold examples "make examples"
9if [ "$BUILDSYSTEM" = "ninja" ] ; then 9echo "TODO"
10 echo "TODO" 10
11else
12 if [ "$DISTRO" != "" ] ; then
13 docker exec --env MAKEFLAGS="-j5 -rR" --env EIO_MONITOR_POLL=1 $(cat $HOME/cid) make examples
14 else
15 export PATH="/usr/local/opt/ccache/libexec:$(brew --prefix gettext)/bin:$PATH"
16 make examples
17 fi
18fi
19travis_endfold examples 11travis_endfold examples
diff --git a/.ci/ci-make-install.sh b/.ci/ci-make-install.sh
index e855ba9dcd..bb175653db 100755
--- a/.ci/ci-make-install.sh
+++ b/.ci/ci-make-install.sh
@@ -6,19 +6,10 @@ if [ "$1" = "release-ready" ] ; then
6 exit 0 6 exit 0
7fi 7fi
8travis_fold install "make install" 8travis_fold install "make install"
9if [ "$BUILDSYSTEM" = "ninja" ] ; then 9if [ "$DISTRO" != "" ] ; then
10 if [ "$DISTRO" != "" ] ; then 10 docker exec --env MAKEFLAGS="-j5 -rR" --env EIO_MONITOR_POLL=1 $(cat $HOME/cid) ninja -C build install
11 docker exec --env MAKEFLAGS="-j5 -rR" --env EIO_MONITOR_POLL=1 $(cat $HOME/cid) ninja -C build install
12 else
13 export PATH="/usr/local/opt/ccache/libexec:$(brew --prefix gettext)/bin:$PATH"
14 ninja -C build install
15 fi
16else 11else
17 if [ "$DISTRO" != "" ] ; then 12 export PATH="/usr/local/opt/ccache/libexec:$(brew --prefix gettext)/bin:$PATH"
18 docker exec --env MAKEFLAGS="-j5 -rR" --env EIO_MONITOR_POLL=1 $(cat $HOME/cid) make install 13 ninja -C build install
19 else
20 export PATH="/usr/local/opt/ccache/libexec:$(brew --prefix gettext)/bin:$PATH"
21 make install
22 fi
23fi 14fi
24travis_endfold install 15travis_endfold install
diff --git a/.ci/ci-make.sh b/.ci/ci-make.sh
index 2cc6ee873f..26188d8fe3 100755
--- a/.ci/ci-make.sh
+++ b/.ci/ci-make.sh
@@ -6,19 +6,10 @@ if [ "$1" = "release-ready" ] ; then
6 exit 0 6 exit 0
7fi 7fi
8travis_fold make make 8travis_fold make make
9if [ "$BUILDSYSTEM" = "ninja" ] ; then 9if [ "$DISTRO" != "" ] ; then
10 if [ "$DISTRO" != "" ] ; then 10 docker exec --env MAKEFLAGS="-j5 -rR" --env EIO_MONITOR_POLL=1 $(cat $HOME/cid) ninja -C build
11 docker exec --env MAKEFLAGS="-j5 -rR" --env EIO_MONITOR_POLL=1 $(cat $HOME/cid) ninja -C build
12 else
13 export PATH="$(brew --prefix gettext)/bin:$PATH"
14 ninja -C build
15 fi
16else 11else
17 if [ "$DISTRO" != "" ] ; then 12 export PATH="$(brew --prefix gettext)/bin:$PATH"
18 docker exec --env MAKEFLAGS="-j5 -rR" --env EIO_MONITOR_POLL=1 $(cat $HOME/cid) make 13 ninja -C build
19 else
20 export PATH="$(brew --prefix gettext)/bin:$PATH"
21 make
22 fi
23fi 14fi
24travis_endfold make 15travis_endfold make