summaryrefslogtreecommitdiff
path: root/.ci
diff options
context:
space:
mode:
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
11WAYLAND_LINUX_COPTS=" --enable-wayland --enable-elput --enable-drm \ 11WAYLAND_LINUX_COPTS=" --enable-wayland --enable-elput --enable-drm \
12--enable-wayland-ivi-shell --enable-gl-drm --with-opengl=es --enable-egl" 12--enable-wayland-ivi-shell --enable-gl-drm --with-opengl=es --enable-egl"
13 13
14MISC_LINUX_COPTS=" --enable-harfbuzz --enable-liblz4 --enable-image-loader-webp --enable-xinput22 \ 14ENABLED_LINUX_COPTS=" --enable-harfbuzz --enable-liblz4 --enable-image-loader-webp --enable-xinput22 \
15--enable-multisense --enable-lua-old --enable-xpresent --enable-hyphen \ 15--enable-multisense --enable-lua-old --enable-xpresent --enable-hyphen \
16--enable-pixman --enable-pixman-font --enable-pixman-rect --enable-pixman-line \ 16--enable-pixman --enable-pixman-font --enable-pixman-rect --enable-pixman-line \
17--enable-pixman-poly --enable-pixman-image --enable-pixman-image-scale-sample \ 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 \ 18--enable-image-loader-generic --enable-libuv --enable-tile-rotate --enable-vnc-server \
19--enable-sdl --enable-fb --enable-v4l2 --enable-cserve \ 19--enable-fb --enable-v4l2 --enable-cserve \
20--enable-ecore-wayland --enable-ecore-drm --enable-cancel-ok --with-crypto=gnutls \ 20--enable-ecore-wayland --enable-ecore-drm --enable-cancel-ok --with-crypto=gnutls \
21--enable-debug --disable-gstreamer1 --enable-gstreamer" 21--enable-debug --disable-gstreamer1 --enable-gstreamer"
22 22
23MISC_DISABLED_LINUX_COPTS=" --disable-neon --disable-libeeze --disable-systemd --disable-magic-debug \ 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 \
24--disable-valgrind --disable-gstreamer1 \ 28--disable-valgrind --disable-gstreamer1 \
25--disable-fontconfig --disable-fribidi --disable-poppler --disable-spectre --disable-libraw \ 29--disable-fontconfig --disable-fribidi --disable-poppler --disable-spectre --disable-libraw \
26--disable-librsvg --disable-xcf --disable-libmount --disable-tslib --disable-audio \ 30--disable-librsvg --disable-xcf --disable-libmount --disable-tslib --disable-audio \
@@ -43,16 +47,12 @@ if [ "$DISTRO" != "" ] ; then
43 # Normal build test of all targets 47 # Normal build test of all targets
44 OPTS="$DEFAULT_LINUX_COPTS" 48 OPTS="$DEFAULT_LINUX_COPTS"
45 49
46 if [ "$1" = "wayland" ]; then 50 if [ "$1" = "options-enabled" ]; then
47 OPTS="$OPTS $WAYLAND_LINUX_COPTS" 51 OPTS="$OPTS $ENABLED_LINUX_COPTS $WAYLAND_LINUX_COPTS"
48 fi
49
50 if [ "$1" = "misc" ]; then
51 OPTS="$OPTS $MISC_LINUX_COPTS"
52 fi 52 fi
53 53
54 if [ "$1" = "misc-disabled" ]; then 54 if [ "$1" = "options-disabled" ]; then
55 OPTS="$OPTS $MISC_DISABLED_LINUX_COPTS" 55 OPTS="$OPTS $DISABLED_LINUX_COPTS"
56 fi 56 fi
57 57
58 if [ "$1" = "release-ready" ]; then 58 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
10fi 10fi
11 11
12#T7151 12#T7151
13if [ "$1" = "misc" ] || [ "$1" = "misc-disabled" ] ; then 13if [ "$1" = "options-enabled" ] || [ "$1" = "options-disabled" ] ; then
14 exit 0 14 exit 0
15fi 15fi
16 16