forked from enlightenment/efl
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
This commit is contained in:
parent
47ada4f72c
commit
90f5d5e1f1
|
@ -4,8 +4,7 @@ set -e
|
|||
|
||||
. .ci/travis.sh
|
||||
|
||||
if [ "$BUILDSYSTEM" = "ninja" ] ; then
|
||||
if [ "$DISTRO" != "" ] ; then
|
||||
if [ "$DISTRO" != "" ] ; then
|
||||
# Normal build test of all targets
|
||||
OPTS=" -Decore-imf-loaders-disabler=scim,ibus -Davahi=false -Dbindings=luajit"
|
||||
|
||||
|
@ -50,7 +49,7 @@ if [ "$BUILDSYSTEM" = "ninja" ] ; then
|
|||
--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
|
||||
else
|
||||
# Prepare OSX env for build
|
||||
mkdir -p ~/Library/LaunchAgents
|
||||
ln -sfv /usr/local/opt/d-bus/*.plist ~/Library/LaunchAgents
|
||||
|
@ -62,116 +61,4 @@ if [ "$BUILDSYSTEM" = "ninja" ] ; then
|
|||
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
|
||||
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" = "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 '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
|
||||
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
|
||||
fi
|
||||
travis_endfold configure
|
||||
fi
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -17,8 +17,7 @@ fi
|
|||
NUM_TRIES=5
|
||||
|
||||
travis_fold check "make check-TESTS"
|
||||
if [ "$BUILDSYSTEM" = "ninja" ] ; then
|
||||
if [ "$DISTRO" != "" ] ; 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
|
||||
|
@ -29,24 +28,6 @@ if [ "$BUILDSYSTEM" = "ninja" ] ; then
|
|||
false
|
||||
done
|
||||
fi
|
||||
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
|
||||
|
|
|
@ -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
|
|
@ -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
|
||||
else
|
||||
export PATH="/usr/local/opt/ccache/libexec:$(brew --prefix gettext)/bin:$PATH"
|
||||
ninja -C build dist
|
||||
fi
|
||||
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
|
||||
fi
|
||||
travis_endfold distcheck
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -6,19 +6,10 @@ if [ "$1" = "release-ready" ] ; then
|
|||
exit 0
|
||||
fi
|
||||
travis_fold install "make install"
|
||||
if [ "$BUILDSYSTEM" = "ninja" ] ; then
|
||||
if [ "$DISTRO" != "" ] ; then
|
||||
if [ "$DISTRO" != "" ] ; then
|
||||
docker exec --env MAKEFLAGS="-j5 -rR" --env EIO_MONITOR_POLL=1 $(cat $HOME/cid) ninja -C build install
|
||||
else
|
||||
else
|
||||
export PATH="/usr/local/opt/ccache/libexec:$(brew --prefix gettext)/bin:$PATH"
|
||||
ninja -C build install
|
||||
fi
|
||||
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
|
||||
fi
|
||||
travis_endfold install
|
||||
|
|
|
@ -6,19 +6,10 @@ if [ "$1" = "release-ready" ] ; then
|
|||
exit 0
|
||||
fi
|
||||
travis_fold make make
|
||||
if [ "$BUILDSYSTEM" = "ninja" ] ; then
|
||||
if [ "$DISTRO" != "" ] ; then
|
||||
if [ "$DISTRO" != "" ] ; then
|
||||
docker exec --env MAKEFLAGS="-j5 -rR" --env EIO_MONITOR_POLL=1 $(cat $HOME/cid) ninja -C build
|
||||
else
|
||||
else
|
||||
export PATH="$(brew --prefix gettext)/bin:$PATH"
|
||||
ninja -C build
|
||||
fi
|
||||
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
|
||||
fi
|
||||
travis_endfold make
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Reference in New Issue