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

diff --git a/.ci/ci-configure.sh b/.ci/ci-configure.sh
index 75e16af..e999b40 100755 (executable)
--- a/.ci/ci-configure.sh
+++ b/.ci/ci-configure.sh
@@ -4,174 +4,61 @@ set -e
 
 . .ci/travis.sh
 
-if [ "$BUILDSYSTEM" = "ninja" ] ; then
-  if [ "$DISTRO" != "" ] ; then
-    # Normal build test of all targets
-    OPTS=" -Decore-imf-loaders-disabler=scim,ibus -Davahi=false -Dbindings=luajit"
+if [ "$DISTRO" != "" ] ; then
+  # Normal build test of all targets
+  OPTS=" -Decore-imf-loaders-disabler=scim,ibus -Davahi=false -Dbindings=luajit"
 
-    WAYLAND_LINUX_COPTS=" -Dwl=true -Ddrm=true -Dopengl=es-egl"
+  WAYLAND_LINUX_COPTS=" -Dwl=true -Ddrm=true -Dopengl=es-egl"
 
-    ENABLED_LINUX_COPTS=" -Dharfbuzz=true -Dhyphen=true"
+  ENABLED_LINUX_COPTS=" -Dharfbuzz=true -Dhyphen=true"
 
-    DISABLED_LINUX_COPTS=" -Dsystemd=false"
+  DISABLED_LINUX_COPTS=" -Dsystemd=false"
 
-    RELEASE_READY_LINUX_COPTS=" --buildtype=release"
+  RELEASE_READY_LINUX_COPTS=" --buildtype=release"
 
-    MINGW_COPTS="--cross-file .ci/cross_toolchain.txt -Davahi=false -Deeze=false -Dsystemd=false \
-    -Dpulseaudio=false -Dx11=false -Dopengl=none -Dlibmount=false \
-    -Devas-loaders-disabler=pdf,ps,raw,svg -Devas-modules=static -Dbindings=luajit \
-    -Dbuild-examples=false -Dbuild-tests=false"
+  MINGW_COPTS="--cross-file .ci/cross_toolchain.txt -Davahi=false -Deeze=false -Dsystemd=false \
+  -Dpulseaudio=false -Dx11=false -Dopengl=none -Dlibmount=false \
+  -Devas-loaders-disabler=pdf,ps,raw,svg -Devas-modules=static -Dbindings=luajit \
+  -Dbuild-examples=false -Dbuild-tests=false"
 
-    if [ "$1" = "options-enabled" ]; then
-      OPTS="$OPTS $ENABLED_LINUX_COPTS $WAYLAND_LINUX_COPTS"
-    fi
-
-    if [ "$1" = "options-disabled" ]; then
-      OPTS="$OPTS $DISABLED_LINUX_COPTS"
-    fi
-
-    if [ "$1" = "wayland" ]; then
-      OPTS="$OPTS $WAYLAND_LINUX_COPTS"
-    fi
-
-    if [ "$1" = "release-ready" ]; then
-      OPTS="$OPTS $RELEASE_READY_LINUX_COPTS"
-    fi
-
-    if [ "$1" = "mingw" ]; then
-      OPTS="$OPTS $MINGW_COPTS"
-      docker exec $(cat $HOME/cid) sh -c '.ci/bootstrap-efl-native-for-cross.sh'
-    fi
-    if [ "$1" = "mingw" ]; then
-      docker exec --env MAKEFLAGS="-j5 -rR" --env EIO_MONITOR_POLL=1 --env PKG_CONFIG_PATH="/ewpi-64-install/lib/pkgconfig/" \
-         $(cat $HOME/cid) sh -c "mkdir build && meson build $OPTS"
-    else
-      docker exec --env MAKEFLAGS="-j5 -rR" --env EIO_MONITOR_POLL=1 --env CC="ccache gcc" \
-        --env CXX="ccache g++" --env CFLAGS="-fdirectives-only" --env CXXFLAGS="-fdirectives-only" \
-        --env LD="ld.gold" $(cat $HOME/cid) sh -c "mkdir build && meson build $OPTS"
-    fi
-  else
-    # Prepare OSX env for build
-    mkdir -p ~/Library/LaunchAgents
-    ln -sfv /usr/local/opt/d-bus/*.plist ~/Library/LaunchAgents
-    launchctl load ~/Library/LaunchAgents/org.freedesktop.dbus-session.plist
-    export PATH="/usr/local/opt/ccache/libexec:$(brew --prefix gettext)/bin:$PATH"
-
-    export CFLAGS="-I/usr/local/opt/openssl/include -frewrite-includes $CFLAGS"
-    export LDFLAGS="-L/usr/local/opt/openssl/lib $LDFLAGS"
-    LIBFFI_VER=$(brew list --versions libffi|head -n1|cut -d' ' -f2)
-    export PKG_CONFIG_PATH="/usr/local/opt/openssl/lib/pkgconfig:/usr/local/Cellar/libffi/$LIBFFI_VER/lib/pkgconfig"
-    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
+  if [ "$1" = "options-enabled" ]; then
+    OPTS="$OPTS $ENABLED_LINUX_COPTS $WAYLAND_LINUX_COPTS"
   fi
-else
-  CI_BUILD_TYPE="$1"
-
-  DEFAULT_LINUX_COPTS="--prefix=/usr/ --with-tests=regular --disable-cxx-bindings --disable-dependency-tracking -C"
-
-  WAYLAND_LINUX_COPTS=" --enable-wayland --enable-elput --enable-drm \
-  --enable-wayland-ivi-shell --enable-gl-drm --with-opengl=es --enable-egl"
-
-  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-fb --enable-v4l2 --enable-cserve \
-  --enable-ecore-wayland --enable-ecore-drm --enable-cancel-ok --with-crypto=gnutls \
-  --enable-debug --disable-gstreamer1 --enable-gstreamer"
-
-  # 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 \
-  --disable-pulseaudio --disable-avahi --disable-xinput2 --disable-xim --disable-scim \
-  --disable-ibus --disable-physics --disable-quick-launch --disable-elua"
-
-  RELEASE_READY_LINUX_COPTS=" --with-profile=release"
 
-  MINGW_COPTS=" --prefix=/ewpi-64-install --host=x86_64-w64-mingw32 --with-eolian-gen=/usr/bin/eolian_gen \
-  --with-edje-cc=/usr/bin/edje_cc --with-eet-eet=/usr/bin/eet \
-  --with-bin-elm-prefs-cc=/usr/bin/elm_prefs_cc \
-  --disable-static --with-tests=regular --with-crypto=openssl \
-  --disable-libmount --disable-valgrind --disable-avahi --disable-spectre --disable-libraw \
-  --disable-librsvg --disable-pulseaudio --disable-cxx-bindings"
-
-  patch -p1 < .ci/efl.m4.diff
-  sed -i.orig 's/AC_INIT\(.*\)efl_version-[a-zA-Z0-9]\+/AC_INIT\1efl_version/g' configure.ac
-
-  if [ "$DISTRO" != "" ] ; then
-    # Normal build test of all targets
-    OPTS="$DEFAULT_LINUX_COPTS"
-
-    if [ "$1" = "options-enabled" ]; then
-      OPTS="$OPTS $ENABLED_LINUX_COPTS $WAYLAND_LINUX_COPTS"
-    fi
-
-    if [ "$1" = "options-disabled" ]; then
-      OPTS="$OPTS $DISABLED_LINUX_COPTS"
-    fi
+  if [ "$1" = "options-disabled" ]; then
+    OPTS="$OPTS $DISABLED_LINUX_COPTS"
+  fi
 
-    if [ "$1" = "wayland" ]; then
-      OPTS="$OPTS $WAYLAND_LINUX_COPTS"
-    fi
+  if [ "$1" = "wayland" ]; then
+    OPTS="$OPTS $WAYLAND_LINUX_COPTS"
+  fi
 
-    if [ "$1" = "release-ready" ]; then
-      OPTS="$OPTS $RELEASE_READY_LINUX_COPTS"
-    fi
+  if [ "$1" = "release-ready" ]; then
+    OPTS="$OPTS $RELEASE_READY_LINUX_COPTS"
+  fi
 
-    if [ "$1" = "mingw" ]; then
-      OPTS="$OPTS $MINGW_COPTS"
-      docker exec $(cat $HOME/cid) sh -c 'rm -f /src/config.cache'
-      docker exec $(cat $HOME/cid) sh -c '.ci/bootstrap-efl-native-for-cross.sh'
-    fi
-    docker exec $(cat $HOME/cid) sh -c 'rm -f ~/.ccache/ccache.conf'
-    travis_fold autoreconf autoreconf
-    if [ "$1" = "mingw" ]; then
-      docker exec $(cat $HOME/cid) sh -c 'rm -f /src/config.cache'
-      docker exec --env MAKEFLAGS="-j5 -rR" --env EIO_MONITOR_POLL=1 --env CFLAGS="-pipe" --env CXXFLAGS="-pipe" \
-        --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/" \
-        $(cat $HOME/cid) sh -c "autoreconf -iv"
-    else
-      docker exec --env MAKEFLAGS="-j5 -rR" --env EIO_MONITOR_POLL=1 --env CC="ccache gcc" \
-        --env CXX="ccache g++" --env CFLAGS="-fdirectives-only" --env CXXFLAGS="-fdirectives-only" \
-        --env LD="ld.gold" $(cat $HOME/cid) sh -c "LIBTOOLIZE_OPTIONS='--no-warn' autoreconf -iv"
-    fi
-    travis_endfold autoreconf
-    travis_fold configure "configure $OPTS"
-    if [ "$1" = "mingw" ]; then
-      docker exec --env MAKEFLAGS="-j5 -rR" --env EIO_MONITOR_POLL=1 --env CFLAGS="-pipe" --env CXXFLAGS="-pipe" \
-        --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/" \
-        $(cat $HOME/cid) sh -c ".ci/configure.sh $OPTS"
-    else
-      docker exec --env MAKEFLAGS="-j5 -rR" --env EIO_MONITOR_POLL=1 --env CC="ccache gcc" \
-        --env CXX="ccache g++" --env CFLAGS="-fdirectives-only" --env CXXFLAGS="-fdirectives-only" \
-        --env LD="ld.gold" $(cat $HOME/cid) sh -c ".ci/configure.sh $OPTS"
-    fi
+  if [ "$1" = "mingw" ]; then
+    OPTS="$OPTS $MINGW_COPTS"
+    docker exec $(cat $HOME/cid) sh -c '.ci/bootstrap-efl-native-for-cross.sh'
+  fi
+  if [ "$1" = "mingw" ]; then
+    docker exec --env MAKEFLAGS="-j5 -rR" --env EIO_MONITOR_POLL=1 --env PKG_CONFIG_PATH="/ewpi-64-install/lib/pkgconfig/" \
+       $(cat $HOME/cid) sh -c "mkdir build && meson build $OPTS"
   else
-    OSX_COPTS="--disable-cxx-bindings --with-tests=regular --disable-dependency-tracking -C"
-
-    # Prepare OSX env for build
-    mkdir -p ~/Library/LaunchAgents
-    ln -sfv /usr/local/opt/d-bus/*.plist ~/Library/LaunchAgents
-    launchctl load ~/Library/LaunchAgents/org.freedesktop.dbus-session.plist
-    export PATH="/usr/local/opt/ccache/libexec:$(brew --prefix gettext)/bin:$PATH"
-
-    export CFLAGS="-I/usr/local/opt/openssl/include -frewrite-includes $CFLAGS"
-    export LDFLAGS="-L/usr/local/opt/openssl/lib $LDFLAGS"
-    LIBFFI_VER=$(brew list --versions libffi|head -n1|cut -d' ' -f2)
-    export PKG_CONFIG_PATH="/usr/local/opt/openssl/lib/pkgconfig:/usr/local/Cellar/libffi/$LIBFFI_VER/lib/pkgconfig"
-
-    # Normal build test of all targets
-    rm -f ~/.ccache/ccache.conf
-    travis_fold autoreconf autoreconf
-    LIBTOOLIZE_OPTIONS='--no-warn' autoreconf -iv
-    travis_endfold autoreconf
-    travis_fold configure "configure $OSX_COPTS"
-    .ci/configure.sh $OSX_COPTS
+    docker exec --env MAKEFLAGS="-j5 -rR" --env EIO_MONITOR_POLL=1 --env CC="ccache gcc" \
+      --env CXX="ccache g++" --env CFLAGS="-fdirectives-only" --env CXXFLAGS="-fdirectives-only" \
+      --env LD="ld.gold" $(cat $HOME/cid) sh -c "mkdir build && meson build $OPTS"
   fi
-    travis_endfold configure
+else
+  # Prepare OSX env for build
+  mkdir -p ~/Library/LaunchAgents
+  ln -sfv /usr/local/opt/d-bus/*.plist ~/Library/LaunchAgents
+  launchctl load ~/Library/LaunchAgents/org.freedesktop.dbus-session.plist
+  export PATH="/usr/local/opt/ccache/libexec:$(brew --prefix gettext)/bin:$PATH"
+
+  export CFLAGS="-I/usr/local/opt/openssl/include -frewrite-includes $CFLAGS"
+  export LDFLAGS="-L/usr/local/opt/openssl/lib $LDFLAGS"
+  LIBFFI_VER=$(brew list --versions libffi|head -n1|cut -d' ' -f2)
+  export PKG_CONFIG_PATH="/usr/local/opt/openssl/lib/pkgconfig:/usr/local/Cellar/libffi/$LIBFFI_VER/lib/pkgconfig"
+  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
 fi

diff --git a/.ci/ci-make-benchmark.sh b/.ci/ci-make-benchmark.sh
index 9f297a5..7572b5a 100755 (executable)
--- a/.ci/ci-make-benchmark.sh
+++ b/.ci/ci-make-benchmark.sh
@@ -6,14 +6,13 @@ if [ "$1" = "release-ready" ] ; then
   exit 0
 fi
 travis_fold benchmark "make benchmark"
-if [ "$BUILDSYSTEM" = "ninja" ] ; then
-  echo "Nothing to do here, the benchmarks don't seem to terminate"
-else
-  if [ "$DISTRO" != "" ] ; then
-    docker exec --env MAKEFLAGS="-j5 -rR" --env EIO_MONITOR_POLL=1 $(cat $HOME/cid) make benchmark
-  else
-    export PATH="/usr/local/opt/ccache/libexec:$(brew --prefix gettext)/bin:$PATH"
-    make benchmark
-  fi
-fi
+echo "Nothing to do here, the benchmarks don't seem to terminate"
+#else
+  #if [ "$DISTRO" != "" ] ; then
+    #docker exec --env MAKEFLAGS="-j5 -rR" --env EIO_MONITOR_POLL=1 $(cat $HOME/cid) make benchmark
+  #else
+    #export PATH="/usr/local/opt/ccache/libexec:$(brew --prefix gettext)/bin:$PATH"
+    #make benchmark
+  #fi
+#fi
 travis_endfold benchmark

diff --git a/.ci/ci-make-check.sh b/.ci/ci-make-check.sh
index ff8f5e0..bea7ca7 100755 (executable)
--- a/.ci/ci-make-check.sh
+++ b/.ci/ci-make-check.sh
@@ -17,36 +17,17 @@ fi
 NUM_TRIES=5
 
 travis_fold check "make check-TESTS"
-if [ "$BUILDSYSTEM" = "ninja" ] ; then
-   if [ "$DISTRO" != "" ] ; then
-      # disable them for this distros, after meson 0.49 is out, this can be removed
-      # https://github.com/mesonbuild/meson/commit/253c581412d7f2b09af353dd83d943454bd555be
-      if [ "$DISTRO" != "Ubuntu1810" ] && [ "$DISTRO" != "Debian96" ]; then
-        for tries in $(seq 1 ${NUM_TRIES}); do
-            (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
-            docker exec --env EIO_MONITOR_POLL=1 $(cat $HOME/cid) cat build/meson-logs/testlog-dbus-launch.txt
-            if [ $tries != ${NUM_TRIES} ] ; then echo "tests failed, trying again!" ; fi
-            false
-        done
-      fi
+if [ "$DISTRO" != "" ] ; then
+   # disable them for this distros, after meson 0.49 is out, this can be removed
+   # https://github.com/mesonbuild/meson/commit/253c581412d7f2b09af353dd83d943454bd555be
+   if [ "$DISTRO" != "Ubuntu1810" ] && [ "$DISTRO" != "Debian96" ]; then
+     for tries in $(seq 1 ${NUM_TRIES}); do
+         (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
+         docker exec --env EIO_MONITOR_POLL=1 $(cat $HOME/cid) cat build/meson-logs/testlog-dbus-launch.txt
+         if [ $tries != ${NUM_TRIES} ] ; then echo "tests failed, trying again!" ; fi
+         false
+     done
    fi
-else
-  if [ "$DISTRO" != "" ] ; then
-    for tries in $(seq 1 ${NUM_TRIES}); do
-      (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
-      docker exec --env MAKEFLAGS="-j5 -rR" --env EIO_MONITOR_POLL=1 $(cat $HOME/cid) cat src/test-suite.log
-      if [ $tries != ${NUM_TRIES} ] ; then echo "tests failed, trying again!" ; fi
-      false
-    done
-  #else
-    #export PATH="/usr/local/opt/ccache/libexec:$(brew --prefix gettext)/bin:$PATH"
-    #for tries in 1 2 3 ; do
-      #make -j2 -C src/ check-TESTS && break
-      #cat src/test-suite.log
-      #if [ $tries != 3 ] ; then echo "tests failed, trying again!" ; fi
-      #false
-    #done
-  fi
 fi
 ret=$?
 travis_endfold check

diff --git a/.ci/ci-make-checkbuild.sh b/.ci/ci-make-checkbuild.sh
deleted file mode 100755 (executable)
index 88ca687..0000000
--- a/.ci/ci-make-checkbuild.sh
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/bin/sh
-
-set -e
-. .ci/travis.sh
-if [ "$1" = "release-ready" ] ; then
-  exit 0
-fi
-if [ "$1" = "mingw" ] ; then
-  exit 0
-fi
-travis_fold check-build "make check-build"
-if [ "$BUILDSYSTEM" = "ninja" ] ; then
-  echo "Nothing to do here"
-else
-  if [ "$DISTRO" != "" ] ; then
-    docker exec --env MAKEFLAGS="-j5 -rR" --env EIO_MONITOR_POLL=1 $(cat $HOME/cid) make check-build
-  else
-    export PATH="/usr/local/opt/ccache/libexec:$(brew --prefix gettext)/bin:$PATH"
-    make check-build
-  fi
-fi
-travis_endfold check-build

diff --git a/.ci/ci-make-distcheck.sh b/.ci/ci-make-distcheck.sh
index 59b096a..9876671 100755 (executable)
--- a/.ci/ci-make-distcheck.sh
+++ b/.ci/ci-make-distcheck.sh
@@ -6,27 +6,14 @@ if [ "$1" != "release-ready" ] ; then
   exit 0
 fi
 travis_fold distcheck "make distcheck"
-if [ "$BUILDSYSTEM" = "ninja" ] ; then
 if [ "$DISTRO" != "" ] ; then
-    docker exec --env MAKEFLAGS="-j5 -rR" --env EIO_MONITOR_POLL=1 --env CC="ccache gcc" \
-      --env CXX="ccache g++" \
-      --env CFLAGS="-fdirectives-only" --env CXXFLAGS="-fdirectives-only" \
-      --env LD="ld.gold" $(cat $HOME/cid) dbus-launch ninja -C build dist || \
-      (sudo cat efl-*/_build/sub/src/test-suite.log; false)
-  else
-    export PATH="/usr/local/opt/ccache/libexec:$(brew --prefix gettext)/bin:$PATH"
-    ninja -C build dist
-  fi
+  docker exec --env MAKEFLAGS="-j5 -rR" --env EIO_MONITOR_POLL=1 --env CC="ccache gcc" \
+    --env CXX="ccache g++" \
+    --env CFLAGS="-fdirectives-only" --env CXXFLAGS="-fdirectives-only" \
+    --env LD="ld.gold" $(cat $HOME/cid) dbus-launch ninja -C build dist || \
+    (sudo cat efl-*/_build/sub/src/test-suite.log; false)
 else
-  if [ "$DISTRO" != "" ] ; then
-    docker exec --env MAKEFLAGS="-j5 -rR" --env EIO_MONITOR_POLL=1 --env CC="ccache gcc" \
-      --env CXX="ccache g++" \
-      --env CFLAGS="-fdirectives-only" --env CXXFLAGS="-fdirectives-only" \
-      --env LD="ld.gold" $(cat $HOME/cid) bash -c .ci/distcheck.sh || \
-      (sudo cat efl-*/_build/sub/src/test-suite.log; false)
-  else
-    export PATH="/usr/local/opt/ccache/libexec:$(brew --prefix gettext)/bin:$PATH"
-    make
-  fi
+  export PATH="/usr/local/opt/ccache/libexec:$(brew --prefix gettext)/bin:$PATH"
+  ninja -C build dist
 fi
 travis_endfold distcheck

diff --git a/.ci/ci-make-examples.sh b/.ci/ci-make-examples.sh
index ae8aa73..9ffa6e1 100755 (executable)
--- a/.ci/ci-make-examples.sh
+++ b/.ci/ci-make-examples.sh
@@ -6,14 +6,6 @@ if [ "$1" = "release-ready" ] ; then
   exit 0
 fi
 travis_fold examples "make examples"
-if [ "$BUILDSYSTEM" = "ninja" ] ; then
-  echo "TODO"
-else
-  if [ "$DISTRO" != "" ] ; then
-    docker exec --env MAKEFLAGS="-j5 -rR" --env EIO_MONITOR_POLL=1 $(cat $HOME/cid) make examples
-  else
-    export PATH="/usr/local/opt/ccache/libexec:$(brew --prefix gettext)/bin:$PATH"
-    make examples
-  fi
-fi
+echo "TODO"
+
 travis_endfold examples

diff --git a/.ci/ci-make-install.sh b/.ci/ci-make-install.sh
index e855ba9..bb17565 100755 (executable)
--- a/.ci/ci-make-install.sh
+++ b/.ci/ci-make-install.sh
@@ -6,19 +6,10 @@ if [ "$1" = "release-ready" ] ; then
   exit 0
 fi
 travis_fold install "make install"
-if [ "$BUILDSYSTEM" = "ninja" ] ; then
-  if [ "$DISTRO" != "" ] ; then
-    docker exec --env MAKEFLAGS="-j5 -rR" --env EIO_MONITOR_POLL=1 $(cat $HOME/cid) ninja -C build install
-  else
-    export PATH="/usr/local/opt/ccache/libexec:$(brew --prefix gettext)/bin:$PATH"
-    ninja -C build install
-  fi
+if [ "$DISTRO" != "" ] ; then
+  docker exec --env MAKEFLAGS="-j5 -rR" --env EIO_MONITOR_POLL=1 $(cat $HOME/cid) ninja -C build install
 else
-  if [ "$DISTRO" != "" ] ; then
-    docker exec --env MAKEFLAGS="-j5 -rR" --env EIO_MONITOR_POLL=1 $(cat $HOME/cid) make install
-  else
-    export PATH="/usr/local/opt/ccache/libexec:$(brew --prefix gettext)/bin:$PATH"
-    make install
-  fi
+  export PATH="/usr/local/opt/ccache/libexec:$(brew --prefix gettext)/bin:$PATH"
+  ninja -C build install
 fi
 travis_endfold install

diff --git a/.ci/ci-make.sh b/.ci/ci-make.sh
index 2cc6ee8..26188d8 100755 (executable)
--- a/.ci/ci-make.sh
+++ b/.ci/ci-make.sh
@@ -6,19 +6,10 @@ if [ "$1" = "release-ready" ] ; then
   exit 0
 fi
 travis_fold make make
-if [ "$BUILDSYSTEM" = "ninja" ] ; then
-  if [ "$DISTRO" != "" ] ; then
-    docker exec --env MAKEFLAGS="-j5 -rR" --env EIO_MONITOR_POLL=1 $(cat $HOME/cid) ninja -C build
-  else
-    export PATH="$(brew --prefix gettext)/bin:$PATH"
-    ninja -C build
-  fi
+if [ "$DISTRO" != "" ] ; then
+  docker exec --env MAKEFLAGS="-j5 -rR" --env EIO_MONITOR_POLL=1 $(cat $HOME/cid) ninja -C build
 else
-  if [ "$DISTRO" != "" ] ; then
-    docker exec --env MAKEFLAGS="-j5 -rR" --env EIO_MONITOR_POLL=1 $(cat $HOME/cid) make
-  else
-    export PATH="$(brew --prefix gettext)/bin:$PATH"
-    make
-  fi
+  export PATH="$(brew --prefix gettext)/bin:$PATH"
+  ninja -C build
 fi
 travis_endfold make

diff --git a/.travis.yml b/.travis.yml
index 9c51162..7e5e914 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -76,7 +76,6 @@ script:
   - .ci/ci-configure.sh "$CI_BUILD_TYPE"
   - .ci/ci-setup-ccache.sh "$CI_BUILD_TYPE"
   - .ci/ci-make.sh "$CI_BUILD_TYPE"
-  - .ci/ci-make-checkbuild.sh "$CI_BUILD_TYPE"
   #- .ci/ci-make-examples.sh "$CI_BUILD_TYPE"
   - |
       if [[ "$TRAVIS_OS_NAME" == "linux" ]] && [[ "$CI_BUILD_TYPE" == "" ]]; then