summaryrefslogtreecommitdiff
path: root/.ci
diff options
context:
space:
mode:
authorMarcel Hollerbach <mail@marcel-hollerbach.de>2018-11-07 17:06:10 +0100
committerStefan Schmidt <s.schmidt@samsung.com>2018-11-23 14:38:26 +0100
commit8d1a1f603b1d3482158e7bfb05470de65ac0d2d3 (patch)
tree51fd36204f09e9f379ed8acd448e4816b5fb681a /.ci
parentdefded25ebe6d16a675ee968f8fc0f785310ccdf (diff)
ci: here comes ninja!
this updates the scripts in order to make ninja all / ninja test work as expected. For now there are 2 new jobs options-enabled and options-disabled. mingw and osx will follow in another commit. Benchmarks are disabled for now, as the eina benchmark does not seem to terminate. Differential Revision: https://phab.enlightenment.org/D7255
Diffstat (limited to '.ci')
-rwxr-xr-x.ci/ci-configure.sh234
-rwxr-xr-x.ci/ci-make-benchmark.sh12
-rwxr-xr-x.ci/ci-make-check.sh41
-rwxr-xr-x.ci/ci-make-checkbuild.sh12
-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
-rwxr-xr-x.ci/ci-osx-deps.sh3
9 files changed, 235 insertions, 140 deletions
diff --git a/.ci/ci-configure.sh b/.ci/ci-configure.sh
index 01e7be8b9e..bd434d33c7 100755
--- a/.ci/ci-configure.sh
+++ b/.ci/ci-configure.sh
@@ -4,108 +4,148 @@ set -e
4 4
5. .ci/travis.sh 5. .ci/travis.sh
6 6
7CI_BUILD_TYPE="$1" 7if [ "$BUILDSYSTEM" = "ninja" ] ; then
8 8 if [ "$DISTRO" != "" ] ; then
9DEFAULT_LINUX_COPTS="--prefix=/usr/ --with-tests=regular --disable-cxx-bindings --disable-dependency-tracking -C" 9 # Normal build test of all targets
10 10 OPTS=" -Decore-imf-loaders-disabler=scim,ibus -Davahi=false -Dmono=false -Dcxx=false"
11WAYLAND_LINUX_COPTS=" --enable-wayland --enable-elput --enable-drm \
12--enable-wayland-ivi-shell --enable-gl-drm --with-opengl=es --enable-egl"
13
14ENABLED_LINUX_COPTS=" --enable-harfbuzz --enable-liblz4 --enable-image-loader-webp --enable-xinput22 \
15--enable-multisense --enable-lua-old --enable-xpresent --enable-hyphen \
16--enable-pixman --enable-pixman-font --enable-pixman-rect --enable-pixman-line \
17--enable-pixman-poly --enable-pixman-image --enable-pixman-image-scale-sample \
18--enable-image-loader-generic --enable-libuv --enable-tile-rotate --enable-vnc-server \
19--enable-fb --enable-v4l2 --enable-cserve \
20--enable-ecore-wayland --enable-ecore-drm --enable-cancel-ok --with-crypto=gnutls \
21--enable-debug --disable-gstreamer1 --enable-gstreamer"
22
23# Not compatible with Open GL ES and thus the wayland options. Need to think about having different
24# jobs for the different supported GL flavours.
25#--enable-sdl
26
27DISABLED_LINUX_COPTS=" --disable-neon --disable-libeeze --disable-systemd --disable-magic-debug \
28--disable-valgrind --disable-gstreamer1 \
29--disable-fontconfig --disable-fribidi --disable-poppler --disable-spectre --disable-libraw \
30--disable-librsvg --disable-xcf --disable-libmount --disable-tslib --disable-audio \
31--disable-pulseaudio --disable-avahi --disable-xinput2 --disable-xim --disable-scim \
32--disable-ibus --disable-physics --disable-quick-launch --disable-elua"
33
34RELEASE_READY_LINUX_COPTS=" --with-profile=release"
35
36MINGW_COPTS=" --prefix=/root/EFL/ewpi_64 --host=x86_64-w64-mingw32 --with-eolian-gen=/usr/bin/eolian_gen \
37--with-edje-cc=/usr/bin/edje_cc --with-eet-eet=/usr/bin/eet --with-bin-elm-prefs-cc=/usr/bin/elm_prefs_cc \
38--disable-static --with-tests=regular --with-crypto=openssl --disable-gstreamer1 \
39--disable-libmount --disable-valgrind --disable-avahi --disable-spectre --disable-libraw \
40--disable-librsvg --disable-pulseaudio --disable-cxx-bindings \
41--disable-physics --disable-image-loader-tiff"
42
43patch -p1 < .ci/efl.m4.diff
44sed -i.orig 's/AC_INIT\(.*\)efl_version-[a-zA-Z0-9]\+/AC_INIT\1efl_version/g' configure.ac
45
46if [ "$DISTRO" != "" ] ; then
47 # Normal build test of all targets
48 OPTS="$DEFAULT_LINUX_COPTS"
49
50 if [ "$1" = "options-enabled" ]; then
51 OPTS="$OPTS $ENABLED_LINUX_COPTS $WAYLAND_LINUX_COPTS"
52 fi
53 11
54 if [ "$1" = "options-disabled" ]; then 12 WAYLAND_LINUX_COPTS=" -Dwl=true -Ddrm=true -Dopengl=es-egl"
55 OPTS="$OPTS $DISABLED_LINUX_COPTS"
56 fi
57 13
58 if [ "$1" = "release-ready" ]; then 14 ENABLED_LINUX_COPTS=" -Dharfbuzz=true -Dhyphen=true"
59 OPTS="$OPTS $RELEASE_READY_LINUX_COPTS"
60 fi
61 15
62 if [ "$1" = "mingw" ]; then 16 DISABLED_LINUX_COPTS=" -Dsystemd=false"
63 OPTS="$OPTS $MINGW_COPTS" 17
64 docker exec $(cat $HOME/cid) sh -c 'rm -f /src/config.cache' 18 RELEASE_READY_LINUX_COPTS=" --buildtype=release"
65 fi 19
66 docker exec $(cat $HOME/cid) sh -c 'rm -f ~/.ccache/ccache.conf' 20 if [ "$1" = "options-enabled" ]; then
67 travis_fold autoreconf autoreconf 21 OPTS="$OPTS $ENABLED_LINUX_COPTS $WAYLAND_LINUX_COPTS"
68 if [ "$1" = "mingw" ]; then 22 fi
69 docker exec $(cat $HOME/cid) sh -c 'rm -f /src/config.cache' 23
70 docker exec --env MAKEFLAGS="-j5 -rR" --env EIO_MONITOR_POLL=1 --env CFLAGS="-pipe" --env CXXFLAGS="-pipe" \ 24 if [ "$1" = "options-disabled" ]; then
71 --env CPPFLAGS="-I/root/EFL/ewpi_64/include -DECORE_WIN32_WIP_POZEFLKSD" --env LDFLAGS="-L/root/EFL/ewpi_64/lib/" --env PKG_CONFIG_PATH="/root/EFL/ewpi_64/lib/pkgconfig/" \ 25 OPTS="$OPTS $DISABLED_LINUX_COPTS"
72 $(cat $HOME/cid) sh -c "autoreconf -iv" 26 fi
73 else 27
28 if [ "$1" = "release-ready" ]; then
29 OPTS="$OPTS $RELEASE_READY_LINUX_COPTS"
30 fi
74 docker exec --env MAKEFLAGS="-j5 -rR" --env EIO_MONITOR_POLL=1 --env CC="ccache gcc" \ 31 docker exec --env MAKEFLAGS="-j5 -rR" --env EIO_MONITOR_POLL=1 --env CC="ccache gcc" \
75 --env CXX="ccache g++" --env CFLAGS="-fdirectives-only" --env CXXFLAGS="-fdirectives-only" \ 32 --env CXX="ccache g++" --env CFLAGS="-fdirectives-only" --env CXXFLAGS="-fdirectives-only" \
76 --env LD="ld.gold" $(cat $HOME/cid) sh -c "LIBTOOLIZE_OPTIONS='--no-warn' autoreconf -iv" 33 --env LD="ld.gold" $(cat $HOME/cid) sh -c "mkdir build && meson build $OPTS"
77 fi
78 travis_endfold autoreconf
79 travis_fold configure "configure $OPTS"
80 if [ "$1" = "mingw" ]; then
81 docker exec --env MAKEFLAGS="-j5 -rR" --env EIO_MONITOR_POLL=1 --env CFLAGS="-pipe" --env CXXFLAGS="-pipe" \
82 --env CPPFLAGS="-I/root/EFL/ewpi_64/include -DECORE_WIN32_WIP_POZEFLKSD" --env LDFLAGS="-L/root/EFL/ewpi_64/lib/" --env PKG_CONFIG_PATH="/root/EFL/ewpi_64/lib/pkgconfig/" \
83 $(cat $HOME/cid) sh -c ".ci/configure.sh $OPTS"
84 else 34 else
85 docker exec --env MAKEFLAGS="-j5 -rR" --env EIO_MONITOR_POLL=1 --env CC="ccache gcc" \ 35 # Prepare OSX env for build
86 --env CXX="ccache g++" --env CFLAGS="-fdirectives-only" --env CXXFLAGS="-fdirectives-only" \ 36 mkdir -p ~/Library/LaunchAgents
87 --env LD="ld.gold" $(cat $HOME/cid) sh -c ".ci/configure.sh $OPTS" 37 ln -sfv /usr/local/opt/d-bus/*.plist ~/Library/LaunchAgents
38 launchctl load ~/Library/LaunchAgents/org.freedesktop.dbus-session.plist
39 export PATH="/usr/local/opt/ccache/libexec:$(brew --prefix gettext)/bin:$PATH"
40
41 export CFLAGS="-I/usr/local/opt/openssl/include -frewrite-includes $CFLAGS"
42 export LDFLAGS="-L/usr/local/opt/openssl/lib $LDFLAGS"
43 export PKG_CONFIG_PATH="/usr/local/opt/openssl/lib/pkgconfig"
44 mkdir build && meson build -Decore-imf-loaders-disabler=scim,ibus -Dx11=false -Davahi=false -Dmono=false -Dcxx=false -Deeze=false -Dsystemd=false -Dnls=false -Dcocoa=true -Demotion-loaders-disabler=gstreamer,gstreamer1,libvlc,xine
88 fi 45 fi
89 travis_endfold configure
90else 46else
91 OSX_COPTS="--disable-cxx-bindings --with-tests=regular --disable-dependency-tracking -C" 47 CI_BUILD_TYPE="$1"
92 48
93 # Prepare OSX env for build 49 DEFAULT_LINUX_COPTS="--prefix=/usr/ --with-tests=regular --disable-cxx-bindings --disable-dependency-tracking -C"
94 mkdir -p ~/Library/LaunchAgents 50
95 ln -sfv /usr/local/opt/d-bus/*.plist ~/Library/LaunchAgents 51 WAYLAND_LINUX_COPTS=" --enable-wayland --enable-elput --enable-drm \
96 launchctl load ~/Library/LaunchAgents/org.freedesktop.dbus-session.plist 52 --enable-wayland-ivi-shell --enable-gl-drm --with-opengl=es --enable-egl"
97 export PATH="/usr/local/opt/ccache/libexec:$(brew --prefix gettext)/bin:$PATH" 53
98 54 ENABLED_LINUX_COPTS=" --enable-harfbuzz --enable-liblz4 --enable-image-loader-webp --enable-xinput22 \
99 export CFLAGS="-I/usr/local/opt/openssl/include -frewrite-includes $CFLAGS" 55 --enable-multisense --enable-lua-old --enable-xpresent --enable-hyphen \
100 export LDFLAGS="-L/usr/local/opt/openssl/lib $LDFLAGS" 56 --enable-pixman --enable-pixman-font --enable-pixman-rect --enable-pixman-line \
101 export PKG_CONFIG_PATH="/usr/local/opt/openssl/lib/pkgconfig" 57 --enable-pixman-poly --enable-pixman-image --enable-pixman-image-scale-sample \
102 58 --enable-image-loader-generic --enable-libuv --enable-tile-rotate --enable-vnc-server \
103 # Normal build test of all targets 59 --enable-fb --enable-v4l2 --enable-cserve \
104 rm -f ~/.ccache/ccache.conf 60 --enable-ecore-wayland --enable-ecore-drm --enable-cancel-ok --with-crypto=gnutls \
105 travis_fold autoreconf autoreconf 61 --enable-debug --disable-gstreamer1 --enable-gstreamer"
106 LIBTOOLIZE_OPTIONS='--no-warn' autoreconf -iv 62
107 travis_endfold autoreconf 63 # Not compatible with Open GL ES and thus the wayland options. Need to think about having different
108 travis_fold configure "configure $OSX_COPTS" 64 # jobs for the different supported GL flavours.
109 .ci/configure.sh $OSX_COPTS 65 #--enable-sdl
110 travis_endfold configure 66
67 DISABLED_LINUX_COPTS=" --disable-neon --disable-libeeze --disable-systemd --disable-magic-debug \
68 --disable-valgrind --disable-gstreamer1 \
69 --disable-fontconfig --disable-fribidi --disable-poppler --disable-spectre --disable-libraw \
70 --disable-librsvg --disable-xcf --disable-libmount --disable-tslib --disable-audio \
71 --disable-pulseaudio --disable-avahi --disable-xinput2 --disable-xim --disable-scim \
72 --disable-ibus --disable-physics --disable-quick-launch --disable-elua"
73
74 RELEASE_READY_LINUX_COPTS=" --with-profile=release"
75
76 MINGW_COPTS=" --prefix=/root/EFL/ewpi_64 --host=x86_64-w64-mingw32 --with-eolian-gen=/usr/bin/eolian_gen \
77 --with-edje-cc=/usr/bin/edje_cc --with-eet-eet=/usr/bin/eet --with-bin-elm-prefs-cc=/usr/bin/elm_prefs_cc \
78 --disable-static --with-tests=regular --with-crypto=openssl --disable-gstreamer1 \
79 --disable-libmount --disable-valgrind --disable-avahi --disable-spectre --disable-libraw \
80 --disable-librsvg --disable-pulseaudio --disable-cxx-bindings \
81 --disable-physics --disable-image-loader-tiff"
82
83 patch -p1 < .ci/efl.m4.diff
84 sed -i.orig 's/AC_INIT\(.*\)efl_version-[a-zA-Z0-9]\+/AC_INIT\1efl_version/g' configure.ac
85
86 if [ "$DISTRO" != "" ] ; then
87 # Normal build test of all targets
88 OPTS="$DEFAULT_LINUX_COPTS"
89
90 if [ "$1" = "options-enabled" ]; then
91 OPTS="$OPTS $ENABLED_LINUX_COPTS $WAYLAND_LINUX_COPTS"
92 fi
93
94 if [ "$1" = "options-disabled" ]; then
95 OPTS="$OPTS $DISABLED_LINUX_COPTS"
96 fi
97
98 if [ "$1" = "release-ready" ]; then
99 OPTS="$OPTS $RELEASE_READY_LINUX_COPTS"
100 fi
101
102 if [ "$1" = "mingw" ]; then
103 OPTS="$OPTS $MINGW_COPTS"
104 docker exec $(cat $HOME/cid) sh -c 'rm -f /src/config.cache'
105 fi
106 docker exec $(cat $HOME/cid) sh -c 'rm -f ~/.ccache/ccache.conf'
107 travis_fold autoreconf autoreconf
108 if [ "$1" = "mingw" ]; then
109 docker exec $(cat $HOME/cid) sh -c 'rm -f /src/config.cache'
110 docker exec --env MAKEFLAGS="-j5 -rR" --env EIO_MONITOR_POLL=1 --env CFLAGS="-pipe" --env CXXFLAGS="-pipe" \
111 --env CPPFLAGS="-I/root/EFL/ewpi_64/include -DECORE_WIN32_WIP_POZEFLKSD" --env LDFLAGS="-L/root/EFL/ewpi_64/lib/" --env PKG_CONFIG_PATH="/root/EFL/ewpi_64/lib/pkgconfig/" \
112 $(cat $HOME/cid) sh -c "autoreconf -iv"
113 else
114 docker exec --env MAKEFLAGS="-j5 -rR" --env EIO_MONITOR_POLL=1 --env CC="ccache gcc" \
115 --env CXX="ccache g++" --env CFLAGS="-fdirectives-only" --env CXXFLAGS="-fdirectives-only" \
116 --env LD="ld.gold" $(cat $HOME/cid) sh -c "LIBTOOLIZE_OPTIONS='--no-warn' autoreconf -iv"
117 fi
118 travis_endfold autoreconf
119 travis_fold configure "configure $OPTS"
120 if [ "$1" = "mingw" ]; then
121 docker exec --env MAKEFLAGS="-j5 -rR" --env EIO_MONITOR_POLL=1 --env CFLAGS="-pipe" --env CXXFLAGS="-pipe" \
122 --env CPPFLAGS="-I/root/EFL/ewpi_64/include -DECORE_WIN32_WIP_POZEFLKSD" --env LDFLAGS="-L/root/EFL/ewpi_64/lib/" --env PKG_CONFIG_PATH="/root/EFL/ewpi_64/lib/pkgconfig/" \
123 $(cat $HOME/cid) sh -c ".ci/configure.sh $OPTS"
124 else
125 docker exec --env MAKEFLAGS="-j5 -rR" --env EIO_MONITOR_POLL=1 --env CC="ccache gcc" \
126 --env CXX="ccache g++" --env CFLAGS="-fdirectives-only" --env CXXFLAGS="-fdirectives-only" \
127 --env LD="ld.gold" $(cat $HOME/cid) sh -c ".ci/configure.sh $OPTS"
128 fi
129 else
130 OSX_COPTS="--disable-cxx-bindings --with-tests=regular --disable-dependency-tracking -C"
131
132 # Prepare OSX env for build
133 mkdir -p ~/Library/LaunchAgents
134 ln -sfv /usr/local/opt/d-bus/*.plist ~/Library/LaunchAgents
135 launchctl load ~/Library/LaunchAgents/org.freedesktop.dbus-session.plist
136 export PATH="/usr/local/opt/ccache/libexec:$(brew --prefix gettext)/bin:$PATH"
137
138 export CFLAGS="-I/usr/local/opt/openssl/include -frewrite-includes $CFLAGS"
139 export LDFLAGS="-L/usr/local/opt/openssl/lib $LDFLAGS"
140 export PKG_CONFIG_PATH="/usr/local/opt/openssl/lib/pkgconfig"
141
142 # Normal build test of all targets
143 rm -f ~/.ccache/ccache.conf
144 travis_fold autoreconf autoreconf
145 LIBTOOLIZE_OPTIONS='--no-warn' autoreconf -iv
146 travis_endfold autoreconf
147 travis_fold configure "configure $OSX_COPTS"
148 .ci/configure.sh $OSX_COPTS
149 fi
150 travis_endfold configure
111fi 151fi
diff --git a/.ci/ci-make-benchmark.sh b/.ci/ci-make-benchmark.sh
index d8357173e5..9f297a5fcb 100755
--- a/.ci/ci-make-benchmark.sh
+++ b/.ci/ci-make-benchmark.sh
@@ -6,10 +6,14 @@ if [ "$1" = "release-ready" ] ; then
6 exit 0 6 exit 0
7fi 7fi
8travis_fold benchmark "make benchmark" 8travis_fold benchmark "make benchmark"
9if [ "$DISTRO" != "" ] ; then 9if [ "$BUILDSYSTEM" = "ninja" ] ; then
10 docker exec --env MAKEFLAGS="-j5 -rR" --env EIO_MONITOR_POLL=1 $(cat $HOME/cid) make benchmark 10 echo "Nothing to do here, the benchmarks don't seem to terminate"
11else 11else
12 export PATH="/usr/local/opt/ccache/libexec:$(brew --prefix gettext)/bin:$PATH" 12 if [ "$DISTRO" != "" ] ; then
13 make benchmark 13 docker exec --env MAKEFLAGS="-j5 -rR" --env EIO_MONITOR_POLL=1 $(cat $HOME/cid) make benchmark
14 else
15 export PATH="/usr/local/opt/ccache/libexec:$(brew --prefix gettext)/bin:$PATH"
16 make benchmark
17 fi
14fi 18fi
15travis_endfold benchmark 19travis_endfold benchmark
diff --git a/.ci/ci-make-check.sh b/.ci/ci-make-check.sh
index 6813ea7c39..1744b4894c 100755
--- a/.ci/ci-make-check.sh
+++ b/.ci/ci-make-check.sh
@@ -17,21 +17,32 @@ fi
17NUM_TRIES=5 17NUM_TRIES=5
18 18
19travis_fold check "make check-TESTS" 19travis_fold check "make check-TESTS"
20if [ "$DISTRO" != "" ] ; then 20if [ "$BUILDSYSTEM" = "ninja" ] ; then
21 for tries in $(seq 1 ${NUM_TRIES}); do 21 if [ "$DISTRO" != "" ] ; then
22 (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 22 for tries in $(seq 1 ${NUM_TRIES}); do
23 docker exec --env MAKEFLAGS="-j5 -rR" --env EIO_MONITOR_POLL=1 $(cat $HOME/cid) cat src/test-suite.log 23 (docker exec --env EINA_LOG_BACKTRACE="0" --env MAKEFLAGS="-j5 -rR" --env EIO_MONITOR_POLL=1 $(cat $HOME/cid) ninja -C build test) && break
24 if [ $tries != ${NUM_TRIES} ] ; then echo "tests failed, trying again!" ; fi 24 docker exec --env MAKEFLAGS="-j5 -rR" --env EIO_MONITOR_POLL=1 $(cat $HOME/cid) cat src/test-suite.log
25 false 25 if [ $tries != ${NUM_TRIES} ] ; then echo "tests failed, trying again!" ; fi
26 done 26 false
27#else 27 done
28 #export PATH="/usr/local/opt/ccache/libexec:$(brew --prefix gettext)/bin:$PATH" 28 fi
29 #for tries in 1 2 3 ; do 29else
30 #make -j2 -C src/ check-TESTS && break 30 if [ "$DISTRO" != "" ] ; then
31 #cat src/test-suite.log 31 for tries in $(seq 1 ${NUM_TRIES}); do
32 #if [ $tries != 3 ] ; then echo "tests failed, trying again!" ; fi 32 (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
33 #false 33 docker exec --env MAKEFLAGS="-j5 -rR" --env EIO_MONITOR_POLL=1 $(cat $HOME/cid) cat src/test-suite.log
34 #done 34 if [ $tries != ${NUM_TRIES} ] ; then echo "tests failed, trying again!" ; fi
35 false
36 done
37 #else
38 #export PATH="/usr/local/opt/ccache/libexec:$(brew --prefix gettext)/bin:$PATH"
39 #for tries in 1 2 3 ; do
40 #make -j2 -C src/ check-TESTS && break
41 #cat src/test-suite.log
42 #if [ $tries != 3 ] ; then echo "tests failed, trying again!" ; fi
43 #false
44 #done
45 fi
35fi 46fi
36ret=$? 47ret=$?
37travis_endfold check 48travis_endfold check
diff --git a/.ci/ci-make-checkbuild.sh b/.ci/ci-make-checkbuild.sh
index 0fb77b1ffc..88ca687d42 100755
--- a/.ci/ci-make-checkbuild.sh
+++ b/.ci/ci-make-checkbuild.sh
@@ -9,10 +9,14 @@ if [ "$1" = "mingw" ] ; then
9 exit 0 9 exit 0
10fi 10fi
11travis_fold check-build "make check-build" 11travis_fold check-build "make check-build"
12if [ "$DISTRO" != "" ] ; then 12if [ "$BUILDSYSTEM" = "ninja" ] ; then
13 docker exec --env MAKEFLAGS="-j5 -rR" --env EIO_MONITOR_POLL=1 $(cat $HOME/cid) make check-build 13 echo "Nothing to do here"
14else 14else
15 export PATH="/usr/local/opt/ccache/libexec:$(brew --prefix gettext)/bin:$PATH" 15 if [ "$DISTRO" != "" ] ; then
16 make check-build 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
17fi 21fi
18travis_endfold check-build 22travis_endfold check-build
diff --git a/.ci/ci-make-distcheck.sh b/.ci/ci-make-distcheck.sh
index 83541ba577..59b096a2ee 100755
--- a/.ci/ci-make-distcheck.sh
+++ b/.ci/ci-make-distcheck.sh
@@ -6,14 +6,27 @@ 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
9if [ "$DISTRO" != "" ] ; then 10if [ "$DISTRO" != "" ] ; then
10 docker exec --env MAKEFLAGS="-j5 -rR" --env EIO_MONITOR_POLL=1 --env CC="ccache gcc" \ 11 docker exec --env MAKEFLAGS="-j5 -rR" --env EIO_MONITOR_POLL=1 --env CC="ccache gcc" \
11 --env CXX="ccache g++" \ 12 --env CXX="ccache g++" \
12 --env CFLAGS="-fdirectives-only" --env CXXFLAGS="-fdirectives-only" \ 13 --env CFLAGS="-fdirectives-only" --env CXXFLAGS="-fdirectives-only" \
13 --env LD="ld.gold" $(cat $HOME/cid) bash -c .ci/distcheck.sh || \ 14 --env LD="ld.gold" $(cat $HOME/cid) dbus-launch ninja -C build dist || \
14 (sudo cat efl-*/_build/sub/src/test-suite.log; false) 15 (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
15else 20else
16 export PATH="/usr/local/opt/ccache/libexec:$(brew --prefix gettext)/bin:$PATH" 21 if [ "$DISTRO" != "" ] ; then
17 make 22 docker exec --env MAKEFLAGS="-j5 -rR" --env EIO_MONITOR_POLL=1 --env CC="ccache gcc" \
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
18fi 31fi
19travis_endfold distcheck 32travis_endfold distcheck
diff --git a/.ci/ci-make-examples.sh b/.ci/ci-make-examples.sh
index 6a59898083..ae8aa736ca 100755
--- a/.ci/ci-make-examples.sh
+++ b/.ci/ci-make-examples.sh
@@ -6,10 +6,14 @@ if [ "$1" = "release-ready" ] ; then
6 exit 0 6 exit 0
7fi 7fi
8travis_fold examples "make examples" 8travis_fold examples "make examples"
9if [ "$DISTRO" != "" ] ; then 9if [ "$BUILDSYSTEM" = "ninja" ] ; then
10 docker exec --env MAKEFLAGS="-j5 -rR" --env EIO_MONITOR_POLL=1 $(cat $HOME/cid) make examples 10 echo "TODO"
11else 11else
12 export PATH="/usr/local/opt/ccache/libexec:$(brew --prefix gettext)/bin:$PATH" 12 if [ "$DISTRO" != "" ] ; then
13 make examples 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
14fi 18fi
15travis_endfold examples 19travis_endfold examples
diff --git a/.ci/ci-make-install.sh b/.ci/ci-make-install.sh
index 48f311bd6b..e855ba9dcd 100755
--- a/.ci/ci-make-install.sh
+++ b/.ci/ci-make-install.sh
@@ -6,10 +6,19 @@ if [ "$1" = "release-ready" ] ; then
6 exit 0 6 exit 0
7fi 7fi
8travis_fold install "make install" 8travis_fold install "make install"
9if [ "$DISTRO" != "" ] ; then 9if [ "$BUILDSYSTEM" = "ninja" ] ; then
10 docker exec --env MAKEFLAGS="-j5 -rR" --env EIO_MONITOR_POLL=1 $(cat $HOME/cid) make install 10 if [ "$DISTRO" != "" ] ; then
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
11else 16else
12 export PATH="/usr/local/opt/ccache/libexec:$(brew --prefix gettext)/bin:$PATH" 17 if [ "$DISTRO" != "" ] ; then
13 make install 18 docker exec --env MAKEFLAGS="-j5 -rR" --env EIO_MONITOR_POLL=1 $(cat $HOME/cid) make install
19 else
20 export PATH="/usr/local/opt/ccache/libexec:$(brew --prefix gettext)/bin:$PATH"
21 make install
22 fi
14fi 23fi
15travis_endfold install 24travis_endfold install
diff --git a/.ci/ci-make.sh b/.ci/ci-make.sh
index dbe1ab4352..2cc6ee873f 100755
--- a/.ci/ci-make.sh
+++ b/.ci/ci-make.sh
@@ -6,10 +6,19 @@ if [ "$1" = "release-ready" ] ; then
6 exit 0 6 exit 0
7fi 7fi
8travis_fold make make 8travis_fold make make
9if [ "$DISTRO" != "" ] ; then 9if [ "$BUILDSYSTEM" = "ninja" ] ; then
10 docker exec --env MAKEFLAGS="-j5 -rR" --env EIO_MONITOR_POLL=1 $(cat $HOME/cid) make 10 if [ "$DISTRO" != "" ] ; then
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
11else 16else
12 export PATH="$(brew --prefix gettext)/bin:$PATH" 17 if [ "$DISTRO" != "" ] ; then
13 make 18 docker exec --env MAKEFLAGS="-j5 -rR" --env EIO_MONITOR_POLL=1 $(cat $HOME/cid) make
19 else
20 export PATH="$(brew --prefix gettext)/bin:$PATH"
21 make
22 fi
14fi 23fi
15travis_endfold make 24travis_endfold make
diff --git a/.ci/ci-osx-deps.sh b/.ci/ci-osx-deps.sh
index 95872f82f3..22672606e8 100755
--- a/.ci/ci-osx-deps.sh
+++ b/.ci/ci-osx-deps.sh
@@ -2,4 +2,5 @@
2 2
3brew update 3brew update
4brew unlink python 4brew unlink python
5brew install gettext check bullet dbus fontconfig freetype fribidi gst-plugins-good gstreamer luajit openssl webp libsndfile glib libspectre libraw librsvg poppler lz4 pulseaudio ccache 5brew install gettext check bullet dbus fontconfig freetype fribidi gst-plugins-good gstreamer luajit openssl webp libsndfile glib libspectre libraw librsvg poppler lz4 pulseaudio ccache ninja python3
6pip3 install meson