aboutsummaryrefslogtreecommitdiffstats
path: root/.ci
diff options
context:
space:
mode:
authorStefan Schmidt <s.schmidt@samsung.com>2018-11-19 14:22:10 +0100
committerStefan Schmidt <s.schmidt@samsung.com>2018-11-23 14:20:25 +0100
commitdefded25ebe6d16a675ee968f8fc0f785310ccdf (patch)
treeb66f62503e57fc2650b385176a8e89d8b63b1aeb /.ci
parenteolian: implement new syntax for inheritance (diff)
downloadefl-defded25ebe6d16a675ee968f8fc0f785310ccdf.tar.gz
travis: merge wayland build into misc and rename to options-enabled
The misc build already had most of the extra options enabled for the EFL build. Instead of wasting CPU cycles on a full seperate build for just wayland options we merge these two together. In the process we rename from misc (pretty vague) to options-enabled and options-disbaled. Due to the combination of options we need to disable sdl for now. It clashes with the OpenGL ES option we enable for wayland. Having build for the different GL flavours is something we should look into at some point. Patch is based on the patches from Marcel in https://phab.enlightenment.org/D7253 and https://phab.enlightenment.org/D7254 Differential Revision: https://phab.enlightenment.org/D7320
Diffstat (limited to '.ci')
-rwxr-xr-x.ci/ci-configure.sh22
-rwxr-xr-x.ci/ci-make-check.sh2
2 files changed, 12 insertions, 12 deletions
diff --git a/.ci/ci-configure.sh b/.ci/ci-configure.sh
index e69cddc3c6..01e7be8b9e 100755
--- a/.ci/ci-configure.sh
+++ b/.ci/ci-configure.sh
@@ -11,16 +11,20 @@ DEFAULT_LINUX_COPTS="--prefix=/usr/ --with-tests=regular --disable-cxx-bindings
WAYLAND_LINUX_COPTS=" --enable-wayland --enable-elput --enable-drm \
--enable-wayland-ivi-shell --enable-gl-drm --with-opengl=es --enable-egl"
-MISC_LINUX_COPTS=" --enable-harfbuzz --enable-liblz4 --enable-image-loader-webp --enable-xinput22 \
+ENABLED_LINUX_COPTS=" --enable-harfbuzz --enable-liblz4 --enable-image-loader-webp --enable-xinput22 \
--enable-multisense --enable-lua-old --enable-xpresent --enable-hyphen \
--enable-pixman --enable-pixman-font --enable-pixman-rect --enable-pixman-line \
--enable-pixman-poly --enable-pixman-image --enable-pixman-image-scale-sample \
--enable-image-loader-generic --enable-libuv --enable-tile-rotate --enable-vnc-server \
---enable-sdl --enable-fb --enable-v4l2 --enable-cserve \
+--enable-fb --enable-v4l2 --enable-cserve \
--enable-ecore-wayland --enable-ecore-drm --enable-cancel-ok --with-crypto=gnutls \
--enable-debug --disable-gstreamer1 --enable-gstreamer"
-MISC_DISABLED_LINUX_COPTS=" --disable-neon --disable-libeeze --disable-systemd --disable-magic-debug \
+# Not compatible with Open GL ES and thus the wayland options. Need to think about having different
+# jobs for the different supported GL flavours.
+#--enable-sdl
+
+DISABLED_LINUX_COPTS=" --disable-neon --disable-libeeze --disable-systemd --disable-magic-debug \
--disable-valgrind --disable-gstreamer1 \
--disable-fontconfig --disable-fribidi --disable-poppler --disable-spectre --disable-libraw \
--disable-librsvg --disable-xcf --disable-libmount --disable-tslib --disable-audio \
@@ -43,16 +47,12 @@ if [ "$DISTRO" != "" ] ; then
# Normal build test of all targets
OPTS="$DEFAULT_LINUX_COPTS"
- if [ "$1" = "wayland" ]; then
- OPTS="$OPTS $WAYLAND_LINUX_COPTS"
- fi
-
- if [ "$1" = "misc" ]; then
- OPTS="$OPTS $MISC_LINUX_COPTS"
+ if [ "$1" = "options-enabled" ]; then
+ OPTS="$OPTS $ENABLED_LINUX_COPTS $WAYLAND_LINUX_COPTS"
fi
- if [ "$1" = "misc-disabled" ]; then
- OPTS="$OPTS $MISC_DISABLED_LINUX_COPTS"
+ if [ "$1" = "options-disabled" ]; then
+ OPTS="$OPTS $DISABLED_LINUX_COPTS"
fi
if [ "$1" = "release-ready" ]; then
diff --git a/.ci/ci-make-check.sh b/.ci/ci-make-check.sh
index 6cbb5433ad..6813ea7c39 100755
--- a/.ci/ci-make-check.sh
+++ b/.ci/ci-make-check.sh
@@ -10,7 +10,7 @@ if [ "$1" = "mingw" ] ; then
fi
#T7151
-if [ "$1" = "misc" ] || [ "$1" = "misc-disabled" ] ; then
+if [ "$1" = "options-enabled" ] || [ "$1" = "options-disabled" ] ; then
exit 0
fi