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

1 files changed, 44 insertions, 157 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
 
 . .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